Index: ash/wm/window_animations.cc |
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc |
index 5bc71cd818fcba33e3f87cb3e841a3cd0c615b38..c1c5c68605d541205940e3e9cace385e51a194aa 100644 |
--- a/ash/wm/window_animations.cc |
+++ b/ash/wm/window_animations.cc |
@@ -277,42 +277,35 @@ class CrossFadeObserver : public ui::CompositorObserver, |
window_->AddObserver(this); |
layer_owner_->root()->GetCompositor()->AddObserver(this); |
} |
- virtual ~CrossFadeObserver() { |
+ ~CrossFadeObserver() override { |
window_->RemoveObserver(this); |
window_ = NULL; |
layer_owner_->root()->GetCompositor()->RemoveObserver(this); |
} |
// ui::CompositorObserver overrides: |
- virtual void OnCompositingDidCommit(ui::Compositor* compositor) override { |
- } |
- virtual void OnCompositingStarted(ui::Compositor* compositor, |
- base::TimeTicks start_time) override { |
- } |
- virtual void OnCompositingEnded(ui::Compositor* compositor) override { |
- } |
- virtual void OnCompositingAborted(ui::Compositor* compositor) override { |
+ void OnCompositingDidCommit(ui::Compositor* compositor) override {} |
+ void OnCompositingStarted(ui::Compositor* compositor, |
+ base::TimeTicks start_time) override {} |
+ void OnCompositingEnded(ui::Compositor* compositor) override {} |
+ void OnCompositingAborted(ui::Compositor* compositor) override { |
// Triggers OnImplicitAnimationsCompleted() to be called and deletes us. |
layer_owner_->root()->GetAnimator()->StopAnimating(); |
} |
- virtual void OnCompositingLockStateChanged( |
- ui::Compositor* compositor) override { |
- } |
+ void OnCompositingLockStateChanged(ui::Compositor* compositor) override {} |
// aura::WindowObserver overrides: |
- virtual void OnWindowDestroying(aura::Window* window) override { |
+ void OnWindowDestroying(aura::Window* window) override { |
// Triggers OnImplicitAnimationsCompleted() to be called and deletes us. |
layer_owner_->root()->GetAnimator()->StopAnimating(); |
} |
- virtual void OnWindowRemovingFromRootWindow(aura::Window* window, |
- aura::Window* new_root) override { |
+ void OnWindowRemovingFromRootWindow(aura::Window* window, |
+ aura::Window* new_root) override { |
layer_owner_->root()->GetAnimator()->StopAnimating(); |
} |
// ui::ImplicitAnimationObserver overrides: |
- virtual void OnImplicitAnimationsCompleted() override { |
- delete this; |
- } |
+ void OnImplicitAnimationsCompleted() override { delete this; } |
private: |
aura::Window* window_; // not owned |