From 8d016ea446328af5aa939654c4f41b90c85e97bf Mon Sep 17 00:00:00 2001 From: "bugzilla%arlen.demon.co.uk" Date: Wed, 1 Dec 2004 17:26:48 +0000 Subject: [PATCH] Bug 237745 split app-startup from core appshell functionality Reland parts of patch following aviary branch landing - already reviewed git-svn-id: svn://10.0.0.236/trunk@166067 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/content/globalOverlay.js | 13 +++---------- .../mozapps/extensions/src/nsExtensionManager.js.in | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/mozilla/toolkit/content/globalOverlay.js b/mozilla/toolkit/content/globalOverlay.js index a36f4841638..ee8ab941aa5 100644 --- a/mozilla/toolkit/content/globalOverlay.js +++ b/mozilla/toolkit/content/globalOverlay.js @@ -47,15 +47,8 @@ function goQuitApplication() var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator); var enumerator = windowManagerInterface.getEnumerator( null ); - var appShell = Components.classes['@mozilla.org/appshell/appShellService;1'].getService(); - appShell = appShell.QueryInterface( Components.interfaces.nsIAppShellService ); - - var nativeAppSupport = null; - try { - nativeAppSupport = appShell.nativeAppSupport; - } - catch ( ex ) { - } + var appStartup = Components.classes['@mozilla.org/toolkit/app-startup;1']. + getService(Components.interfaces.nsIAppStartup); while ( enumerator.hasMoreElements() ) { @@ -64,7 +57,7 @@ function goQuitApplication() return false; domWindow.close(); }; - appShell.quit(Components.interfaces.nsIAppShellService.eAttemptQuit); + appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit); return true; } diff --git a/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in index ed72de6567d..6b6784d99a7 100644 --- a/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in +++ b/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in @@ -1709,7 +1709,7 @@ nsExtensionManager.prototype = { handleCommandLineArgs: function nsExtensionManager_handleCommandLineArgs () { - var cmdLineSvc = Components.classes["@mozilla.org/appshell/commandLineService;1"] + var cmdLineSvc = Components.classes["@mozilla.org/app-startup/commandLineService;1"] .getService(Components.interfaces.nsICmdLineService); var globalExtension = cmdLineSvc.getCmdLineValue("-install-global-extension"); if (globalExtension)