From fe9f89a741d5939d0b59f06876d4a1ec4a45b8e3 Mon Sep 17 00:00:00 2001 From: "jennyz@chromium.org" Date: Wed, 19 Sep 2012 20:45:21 +0000 Subject: Fix the crashing in UpdateNagger. BUG=149681 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=157434 Review URL: https://codereview.chromium.org/10916356 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157603 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/system/status_area_widget.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index 36cc76a..ec610ab 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc @@ -338,10 +338,10 @@ void StatusAreaWidget::Shutdown() { // hierarchy. Do not used scoped pointers since we don't want to destroy them // in the destructor if Shutdown() is not called (e.g. in tests). system_tray_delegate_.reset(); - system_tray_ = NULL; - delete system_tray_; - web_notification_tray_ = NULL; delete web_notification_tray_; + web_notification_tray_ = NULL; + delete system_tray_; + system_tray_ = NULL; } bool StatusAreaWidget::ShouldShowLauncher() const { -- cgit v1.1