| Index: ash/wm/window_animations.cc
|
| diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
|
| index 282567c6816e4c1122ed7e1fdea0bc8c9a8034fb..48ee70103aaca4e04021e700bab8591c3b51e00a 100644
|
| --- a/ash/wm/window_animations.cc
|
| +++ b/ash/wm/window_animations.cc
|
| @@ -573,8 +573,6 @@ class CrossFadeObserver : public ui::CompositorObserver,
|
| // ui::CompositorObserver overrides:
|
| virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {
|
| }
|
| - virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE {
|
| - }
|
| virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE {
|
| }
|
| virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE {
|
| @@ -583,6 +581,9 @@ class CrossFadeObserver : public ui::CompositorObserver,
|
| // Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
|
| layer_->GetAnimator()->StopAnimating();
|
| }
|
| + virtual void OnCompositingLockStateChanged(
|
| + ui::Compositor* compositor) OVERRIDE {
|
| + }
|
|
|
| // aura::WindowObserver overrides:
|
| virtual void OnWindowDestroying(Window* window) OVERRIDE {
|
|
|