diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 02:04:13 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 02:04:13 +0000 |
| commit | 97452c9788b026b810bd4fbd55cfd40711548e3d (patch) | |
| tree | 54a8478ea3cfc7aa1a20fed0bcc8d7f79d26c3ca /chrome/browser/browser_process_impl.cc | |
| parent | 9d28269b246c736e151fd389e9d9d926d06b7247 (diff) | |
| download | chromium_src-97452c9788b026b810bd4fbd55cfd40711548e3d.zip chromium_src-97452c9788b026b810bd4fbd55cfd40711548e3d.tar.gz chromium_src-97452c9788b026b810bd4fbd55cfd40711548e3d.tar.bz2 | |
Reset the notification ui manager even earlier, before the IO thread goes away.
BUG=50553
TEST=see bug
Review URL: http://codereview.chromium.org/2819092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 6ca9d41..5e160c9 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -136,6 +136,10 @@ BrowserProcessImpl::~BrowserProcessImpl() { // Need to clear profiles (download managers) before the io_thread_. profile_manager_.reset(); + // Need to clear the desktop notification balloons before the io_thread_, + // since if there are any left showing we will post tasks. + notification_ui_manager_.reset(); + // Debugger must be cleaned up before IO thread and NotificationService. debugger_wrapper_ = NULL; @@ -193,9 +197,6 @@ BrowserProcessImpl::~BrowserProcessImpl() { // former registers for notifications. tab_closeable_state_watcher_.reset(); - // Destroy NotificationUIManager before NotificationService is shut down. - notification_ui_manager_.reset(); - // Now OK to destroy NotificationService. main_notification_service_.reset(); |