diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 20:45:21 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 20:45:21 +0000 |
| commit | fe9f89a741d5939d0b59f06876d4a1ec4a45b8e3 (patch) | |
| tree | 5ec51604ac9edd5e07aeb5afc303e841cb39f71f /ash/system | |
| parent | 1dd66b72e555cfba44104eb904a140ce316cfc15 (diff) | |
| download | chromium_src-fe9f89a741d5939d0b59f06876d4a1ec4a45b8e3.zip chromium_src-fe9f89a741d5939d0b59f06876d4a1ec4a45b8e3.tar.gz chromium_src-fe9f89a741d5939d0b59f06876d4a1ec4a45b8e3.tar.bz2 | |
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
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/status_area_widget.cc | 6 |
1 files 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 { |