diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 03:24:53 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 03:24:53 +0000 |
| commit | fd162f7743bdca48cdd6f716d7bfe9ac0855f4fe (patch) | |
| tree | 2ddf39aefc22d493d908562f4936353406187383 /ash | |
| parent | 422a5adca3bbeacb0cdf7295eef97666c1afd5ee (diff) | |
| download | chromium_src-fd162f7743bdca48cdd6f716d7bfe9ac0855f4fe.zip chromium_src-fd162f7743bdca48cdd6f716d7bfe9ac0855f4fe.tar.gz chromium_src-fd162f7743bdca48cdd6f716d7bfe9ac0855f4fe.tar.bz2 | |
Close notification windows while message loop is still active
Reset tooltip_controller explicitly so that timer stops at shutdown.
Use tray_ reference in SystemTrayDelegate instead of going through ash instance.
Make sure delegates doesn't access tray after the tray has been deleted.
BUG=104998
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=131902
Review URL: http://codereview.chromium.org/9968101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index d273752..d3b1919 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -566,6 +566,7 @@ Shell::~Shell() { // The system tray needs to be reset before all the windows are destroyed. tray_.reset(); + tray_delegate_.reset(); // Desroy secondary monitor's widgets before all the windows are destroyed. monitor_controller_.reset(); @@ -588,6 +589,7 @@ Shell::~Shell() { window_cycle_controller_.reset(); event_client_.reset(); monitor_controller_.reset(); + tooltip_controller_.reset(); // Launcher widget has a InputMethodBridge that references to // input_method_filter_'s input_method_. So explicitly release launcher_ |