mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 04:45:45 +00:00
move phoenix obs notification, NPOB. r=hewitt/sr=hyatt
This commit is contained in:
parent
c5a67e6cb4
commit
a3ea9803b0
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user