| Index: ash/wm/session_state_animator_impl.h
|
| diff --git a/ash/wm/session_state_animator_impl.h b/ash/wm/session_state_animator_impl.h
|
| index d4792aa942fb5330437ee771c03681ff498168b5..6c634bddaaae3fceb8559c37a3327edd30e60af0 100644
|
| --- a/ash/wm/session_state_animator_impl.h
|
| +++ b/ash/wm/session_state_animator_impl.h
|
| @@ -43,26 +43,24 @@ class ASH_EXPORT SessionStateAnimatorImpl : public SessionStateAnimator {
|
| };
|
|
|
| SessionStateAnimatorImpl();
|
| - virtual ~SessionStateAnimatorImpl();
|
| + ~SessionStateAnimatorImpl() override;
|
|
|
| // Fills |containers| with the containers included in |container_mask|.
|
| static void GetContainers(int container_mask,
|
| aura::Window::Windows* containers);
|
|
|
| // ash::SessionStateAnimator:
|
| - virtual void StartAnimation(int container_mask,
|
| - AnimationType type,
|
| - AnimationSpeed speed) override;
|
| - virtual void StartAnimationWithCallback(
|
| - int container_mask,
|
| - AnimationType type,
|
| - AnimationSpeed speed,
|
| - base::Closure callback) override;
|
| - virtual AnimationSequence* BeginAnimationSequence(
|
| - base::Closure callback) override;
|
| - virtual bool IsBackgroundHidden() const override;
|
| - virtual void ShowBackground() override;
|
| - virtual void HideBackground() override;
|
| + void StartAnimation(int container_mask,
|
| + AnimationType type,
|
| + AnimationSpeed speed) override;
|
| + void StartAnimationWithCallback(int container_mask,
|
| + AnimationType type,
|
| + AnimationSpeed speed,
|
| + base::Closure callback) override;
|
| + AnimationSequence* BeginAnimationSequence(base::Closure callback) override;
|
| + bool IsBackgroundHidden() const override;
|
| + void ShowBackground() override;
|
| + void HideBackground() override;
|
|
|
| private:
|
| class AnimationSequence;
|
|
|