Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / wm / session_state_animator_impl.h

diff --git a/src/ash/wm/session_state_animator_impl.h b/src/ash/wm/session_state_animator_impl.h
index bad7103..6c634bd 100644 (file)
--- a/src/ash/wm/session_state_animator_impl.h
+++ b/src/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;