summaryrefslogtreecommitdiff
path: root/chromium/ash/wm/window_animations.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ash/wm/window_animations.cc')
-rw-r--r--chromium/ash/wm/window_animations.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/ash/wm/window_animations.cc b/chromium/ash/wm/window_animations.cc
index a3c0ca80621..73deafd75c1 100644
--- a/chromium/ash/wm/window_animations.cc
+++ b/chromium/ash/wm/window_animations.cc
@@ -295,6 +295,9 @@ class CrossFadeObserver : public ui::CompositorObserver,
// Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
layer_->GetAnimator()->StopAnimating();
}
+ virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE {
+ layer_->GetAnimator()->StopAnimating();
+ }
// ui::ImplicitAnimationObserver overrides:
virtual void OnImplicitAnimationsCompleted() OVERRIDE {