Commit 072287b7 authored by stevenjb@google.com's avatar stevenjb@google.com

Destroy SystemTrayDelegate in Shutdown()

BUG=140265
R=sadrul

Review URL: https://chromiumcodereview.appspot.com/10836094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150102 0039d316-1c4b-4281-b951-d872f2087c98
parent c44acc9a
...@@ -305,6 +305,7 @@ void StatusAreaWidget::Shutdown() { ...@@ -305,6 +305,7 @@ void StatusAreaWidget::Shutdown() {
// Destroy the trays early, causing them to be removed from the view // Destroy the trays early, causing them to be removed from the view
// hierarchy. Do not used scoped pointers since we don't want to destroy them // 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). // in the destructor if Shutdown() is not called (e.g. in tests).
system_tray_delegate_.reset();
delete system_tray_; delete system_tray_;
system_tray_ = NULL; system_tray_ = NULL;
delete web_notification_tray_; delete web_notification_tray_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment