diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:07:45 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:07:45 +0000 |
| commit | 56c4a49b7ceacce24ef7b4e4ee893417ad1318c7 (patch) | |
| tree | 4962fd0ca51a5f20e4b8930f8425499d6ab8660d /ash/shell | |
| parent | 412b818cc445c9b84796286f20c3ef4589d350da (diff) | |
| download | chromium_src-56c4a49b7ceacce24ef7b4e4ee893417ad1318c7.zip chromium_src-56c4a49b7ceacce24ef7b4e4ee893417ad1318c7.tar.gz chromium_src-56c4a49b7ceacce24ef7b4e4ee893417ad1318c7.tar.bz2 | |
Remove WindowWatcher observer from panel_container_
Crash was introduced here: http://codereview.chromium.org/10091017
BUG=130306
TEST=ash_shell does not crash on shutdown.
Review URL: https://chromiumcodereview.appspot.com/10459028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/window_watcher.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 5398a8a..cbac740 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -23,6 +23,7 @@ WindowWatcher::WindowWatcher() WindowWatcher::~WindowWatcher() { window_->RemoveObserver(this); + panel_container_->RemoveObserver(this); } aura::Window* WindowWatcher::GetWindowByID(ash::LauncherID id) { |