diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 20:52:20 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 20:52:20 +0000 |
commit | c984d9f8b393418f26c8a3a90ceaff17f2d421af (patch) | |
tree | 1e6d691629226bee23228b87b435957a01587c82 /chrome/browser/extensions/extension_process_manager.cc | |
parent | a82ac135a3453615f7289b5fbacc512576858639 (diff) | |
download | chromium_src-c984d9f8b393418f26c8a3a90ceaff17f2d421af.zip chromium_src-c984d9f8b393418f26c8a3a90ceaff17f2d421af.tar.gz chromium_src-c984d9f8b393418f26c8a3a90ceaff17f2d421af.tar.bz2 |
Moved code that generates APP_TERMINATING notification into BrowserList so it can be used on all platforms. Updated observers (ExtensionProcessManager,
BackgroundContents) to listen for APP_TERMINATING instead of listening for
BROWSER_CLOSED on some platforms.
APP_TERMINATING is now sent just before the main message loop exits rather than just after, but no code depends on this timing.
Updated Mac code to always call BrowserList::CloseAllBrowsers() even if there
are no open browsers, to ensure that APP_TERMINATING is always fired.
Changed BackgroundContentsService to keep the browser process alive when there
are BackgroundContents running and updated the unit tests.
Renamed BrowserList::IsInPersistentMode() => WillShutdownWhenLastBrowserCloses() and AllBrowsersClosed() => AllBrowsersClosedAndAppExiting() to more precisely indicate their true functions.
Exposed BrowserProcess::ModuleRefCount() so BrowserList can determine when the application is going to exit so the right notifications/callbacks can be generated.
Updated background-auto-update-restart code to use new BrowserList APIs to determine whether the application is running "in the background".
Added code to cancel shutdown on all plaforms if the user selects cancel in an onbeforeunload dialog.
BUG=45275
TEST=RunInBackgroundTest (ui_test)
Review URL: http://codereview.chromium.org/2866034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_process_manager.cc')
-rw-r--r-- | chrome/browser/extensions/extension_process_manager.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index cd040f8..3cde54e 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -51,13 +51,8 @@ ExtensionProcessManager::ExtensionProcessManager(Profile* profile) NotificationService::AllSources()); registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED, NotificationService::AllSources()); -#if defined(OS_WIN) || defined(OS_LINUX) - registrar_.Add(this, NotificationType::BROWSER_CLOSED, - NotificationService::AllSources()); -#elif defined(OS_MACOSX) registrar_.Add(this, NotificationType::APP_TERMINATING, NotificationService::AllSources()); -#endif } ExtensionProcessManager::~ExtensionProcessManager() { @@ -285,22 +280,14 @@ void ExtensionProcessManager::Observe(NotificationType type, UnregisterExtensionProcess(host->id()); break; } -#if defined(OS_WIN) || defined(OS_LINUX) - case NotificationType::BROWSER_CLOSED: { + + case NotificationType::APP_TERMINATING: { // Close background hosts when the last browser is closed so that they // have time to shutdown various objects on different threads. Our // destructor is called too late in the shutdown sequence. - bool app_closing = *Details<bool>(details).ptr(); - if (app_closing) - CloseBackgroundHosts(); - break; - } -#elif defined(OS_MACOSX) - case NotificationType::APP_TERMINATING: { CloseBackgroundHosts(); break; } -#endif default: NOTREACHED(); |