move phoenix obs notification, NPOB. r=hewitt/sr=hyatt

git-svn-id: svn://10.0.0.236/trunk@131894 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blakeross%telocity.com
2002-10-13 03:51:29 +00:00
parent c80c1c9718
commit 6472e40a8c

View File

@@ -520,11 +520,6 @@ nsAppShellService::Quit(PRUint32 aFerocity)
}
}
#ifdef MOZ_PHOENIX
nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1", &rv);
obsService->NotifyObservers(nsnull, "quit-application", nsnull);
#endif
/* Currently aFerocity can never have the value of eForceQuit here.
That's temporary (in an unscheduled kind of way) and logically
this code is part of the eForceQuit case, so I'm checking against
@@ -588,6 +583,11 @@ nsAppShellService::Quit(PRUint32 aFerocity)
if (aFerocity == eForceQuit) {
// do it!
#ifdef MOZ_PHOENIX
nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1", &rv);
obsService->NotifyObservers(nsnull, "quit-application", nsnull);
#endif
// first shutdown native app support; doing this first will prevent new
// requests to open additional windows coming in.
if (mNativeAppSupport) {