99163 - removing nsObserverService.h includes. Also fixing 106090, extra methods on nsObserverService. r=shaver@mozilla.org, sr=jband@netscape.com

git-svn-id: svn://10.0.0.236/trunk@105973 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2001-10-22 22:01:27 +00:00
parent 1403ab79f6
commit fa2d0b7e98
69 changed files with 115 additions and 182 deletions

View File

@@ -46,7 +46,6 @@
#include "nsIServiceManager.h"
#include "nsIEventQueueService.h"
#include "nsIObserverService.h"
#include "nsObserverService.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"
#include "nsXPComFactory.h" /* template implementation of a XPCOM factory */
@@ -801,7 +800,7 @@ void nsAppShellService::RegisterObserver(PRBool aRegister)
NS_ASSERTION(weObserve, "who's been chopping bits off nsAppShellService?");
rv = nsServiceManager::GetService(NS_OBSERVERSERVICE_CONTRACTID,
rv = nsServiceManager::GetService("@mozilla.org/observer-service;1",
NS_GET_IID(nsIObserverService), &glop);
if (NS_SUCCEEDED(rv)) {
nsIObserverService *os = NS_STATIC_CAST(nsIObserverService*,glop);