diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 01:24:11 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 01:24:11 +0000 |
| commit | 5d91ca90a77597f9073ac762e03a5c0abd65c9b1 (patch) | |
| tree | f3e73cc33a5b39d5a7fee0d1d857bb912a1e62c2 /ash/system | |
| parent | d57fd38fb40a6bb65af7ab40cacd90c350c0aba1 (diff) | |
| download | chromium_src-5d91ca90a77597f9073ac762e03a5c0abd65c9b1.zip chromium_src-5d91ca90a77597f9073ac762e03a5c0abd65c9b1.tar.gz chromium_src-5d91ca90a77597f9073ac762e03a5c0abd65c9b1.tar.bz2 | |
Revert 157434 - Fix the crashing in UpdateNagger.
BUG=149681
Review URL: https://codereview.chromium.org/10916356
TBR=jennyz@chromium.org
Review URL: https://codereview.chromium.org/10949013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/status_area_widget.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index 54feab1..b3e2b4f 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc @@ -336,10 +336,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(); - delete system_tray_; system_tray_ = NULL; - delete web_notification_tray_; + delete system_tray_; web_notification_tray_ = NULL; + delete web_notification_tray_; } bool StatusAreaWidget::ShouldShowLauncher() const { |