summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 07:04:07 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 07:04:07 +0000
commit9c1fe143f8e11092424875fbcdaccec16f141981 (patch)
tree4df870778f4ebefa9a2512d9dff9482966815dd0
parentcd188b9b1950e6dd8bd78828998303efb08b835d (diff)
downloadchromium_src-9c1fe143f8e11092424875fbcdaccec16f141981.zip
chromium_src-9c1fe143f8e11092424875fbcdaccec16f141981.tar.gz
chromium_src-9c1fe143f8e11092424875fbcdaccec16f141981.tar.bz2
Shutdown the notification UI manager before the notifications service, as the former's shutdown logic depends on the latter.
BUG=50553 TEST=see bug Review URL: http://codereview.chromium.org/3051029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54713 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_process_impl.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index af3808f..51cd234 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -193,6 +193,9 @@ 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();