Update To 11.40.268.0

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

diff --git a/src/ash/wm/immersive_fullscreen_controller.h b/src/ash/wm/immersive_fullscreen_controller.h
index 4f0b20b..773c5ec 100644 (file)
--- a/src/ash/wm/immersive_fullscreen_controller.h
+++ b/src/ash/wm/immersive_fullscreen_controller.h
@@ -86,7 +86,7 @@ class ASH_EXPORT ImmersiveFullscreenController
   };
 
   ImmersiveFullscreenController();
-  virtual ~ImmersiveFullscreenController();
+  ~ImmersiveFullscreenController() override;
 
   // Initializes the controller. Must be called prior to enabling immersive
   // fullscreen via SetEnabled(). |top_container| is used to keep the
@@ -126,34 +126,33 @@ class ASH_EXPORT ImmersiveFullscreenController
   void SetupForTest();
 
   // ui::EventHandler overrides:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  void OnMouseEvent(ui::MouseEvent* event) override;
+  void OnTouchEvent(ui::TouchEvent* event) override;
+  void OnGestureEvent(ui::GestureEvent* event) override;
 
   // views::FocusChangeObserver overrides:
-  virtual void OnWillChangeFocus(views::View* focused_before,
-                                 views::View* focused_now) OVERRIDE;
-  virtual void OnDidChangeFocus(views::View* focused_before,
-                                views::View* focused_now) OVERRIDE;
+  void OnWillChangeFocus(views::View* focused_before,
+                         views::View* focused_now) override;
+  void OnDidChangeFocus(views::View* focused_before,
+                        views::View* focused_now) override;
 
   // views::WidgetObserver overrides:
-  virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
-  virtual void OnWidgetActivationChanged(views::Widget* widget,
-                                         bool active) OVERRIDE;
+  void OnWidgetDestroying(views::Widget* widget) override;
+  void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
 
   // gfx::AnimationDelegate overrides:
-  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  void AnimationEnded(const gfx::Animation* animation) override;
+  void AnimationProgressed(const gfx::Animation* animation) override;
 
   // ::wm::TransientWindowObserver overrides:
-  virtual void OnTransientChildAdded(aura::Window* window,
-                                     aura::Window* transient) OVERRIDE;
-  virtual void OnTransientChildRemoved(aura::Window* window,
-                                       aura::Window* transient) OVERRIDE;
+  void OnTransientChildAdded(aura::Window* window,
+                             aura::Window* transient) override;
+  void OnTransientChildRemoved(aura::Window* window,
+                               aura::Window* transient) override;
 
   // ash::ImmersiveRevealedLock::Delegate overrides:
-  virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE;
-  virtual void UnlockRevealedState() OVERRIDE;
+  void LockRevealedState(AnimateReveal animate_reveal) override;
+  void UnlockRevealedState() override;
 
  private:
   friend class ImmersiveFullscreenControllerTest;