diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/ash/wm/window_animations.cc | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/ash/wm/window_animations.cc')
| -rw-r--r-- | chromium/ash/wm/window_animations.cc | 3 |
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 { |