diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 02:42:02 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 02:42:02 +0000 |
| commit | 076f2a73a0c2760fa9949ba77869449701961654 (patch) | |
| tree | f92aceae1df9ef639f4cc5aa4e5f169616aa1011 /ash | |
| parent | bd72736788436d75eff157dc74d3efda312e25cc (diff) | |
| download | chromium_src-076f2a73a0c2760fa9949ba77869449701961654.zip chromium_src-076f2a73a0c2760fa9949ba77869449701961654.tar.gz chromium_src-076f2a73a0c2760fa9949ba77869449701961654.tar.bz2 | |
Makes SystemTray explicitly remove an AnimationObserver. Without this
there can be ordering problems with shutdown.
BUG=137342
TEST=none
R=stevenjb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10857009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/tray/system_tray.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 9aff175..2b7dc1e 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -113,6 +113,8 @@ SystemTray::~SystemTray() { ++it) { (*it)->DestroyTrayView(); } + GetWidget()->GetNativeView()->layer()->GetAnimator()->RemoveObserver( + layer_animation_observer_.get()); } void SystemTray::Initialize() { |