diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 20:48:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 20:48:45 +0000 |
| commit | 29cf75e8d19433c5a5d77f224fb5b73f7e1736d7 (patch) | |
| tree | 4f1a5161f72125e69331b7debfa757d90bb63bc0 /ash/wm | |
| parent | 4dcf030ba7c727866cd22fb1efe5dcf79a9a3ea4 (diff) | |
| download | chromium_src-29cf75e8d19433c5a5d77f224fb5b73f7e1736d7.zip chromium_src-29cf75e8d19433c5a5d77f224fb5b73f7e1736d7.tar.gz chromium_src-29cf75e8d19433c5a5d77f224fb5b73f7e1736d7.tar.bz2 | |
Make WindowEventDispatcher be a WindowObserver instead of duplicating WO APIs
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/196383010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/window_animations.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index e69b94b..109aa1b 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -304,7 +304,8 @@ class CrossFadeObserver : public ui::CompositorObserver, // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. layer_owner_->root()->GetAnimator()->StopAnimating(); } - virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE { + virtual void OnWindowRemovingFromRootWindow(aura::Window* window, + aura::Window* new_root) OVERRIDE { layer_owner_->root()->GetAnimator()->StopAnimating(); } |