| Index: ash/wm/window_animations.cc
|
| diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
|
| index 66831b27469b20f4c13e2fe74575932383d149d9..90c91ce65e0ccdb62706ba792e66943f6668535c 100644
|
| --- a/ash/wm/window_animations.cc
|
| +++ b/ash/wm/window_animations.cc
|
| @@ -653,8 +653,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 {
|
| @@ -663,6 +661,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 {
|
|
|