Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / wm / core / focus_controller.h

diff --git a/src/ui/wm/core/focus_controller.h b/src/ui/wm/core/focus_controller.h
index 2f1aa0e..43d3c60 100644 (file)
--- a/src/ui/wm/core/focus_controller.h
+++ b/src/ui/wm/core/focus_controller.h
@@ -41,45 +41,39 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient,
  public:
   // |rules| cannot be NULL.
   explicit FocusController(FocusRules* rules);
-  virtual ~FocusController();
+  ~FocusController() override;
 
  private:
   // Overridden from aura::client::ActivationClient:
-  virtual void AddObserver(
-      aura::client::ActivationChangeObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(
-      aura::client::ActivationChangeObserver* observer) OVERRIDE;
-  virtual void ActivateWindow(aura::Window* window) OVERRIDE;
-  virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
-  virtual aura::Window* GetActiveWindow() OVERRIDE;
-  virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE;
-  virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE;
-  virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
+  void AddObserver(aura::client::ActivationChangeObserver* observer) override;
+  void RemoveObserver(
+      aura::client::ActivationChangeObserver* observer) override;
+  void ActivateWindow(aura::Window* window) override;
+  void DeactivateWindow(aura::Window* window) override;
+  aura::Window* GetActiveWindow() override;
+  aura::Window* GetActivatableWindow(aura::Window* window) override;
+  aura::Window* GetToplevelWindow(aura::Window* window) override;
+  bool CanActivateWindow(aura::Window* window) const override;
 
   // Overridden from aura::client::FocusClient:
-  virtual void AddObserver(
-      aura::client::FocusChangeObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(
-      aura::client::FocusChangeObserver* observer) OVERRIDE;
-  virtual void FocusWindow(aura::Window* window) OVERRIDE;
-  virtual void ResetFocusWithinActiveWindow(aura::Window* window) OVERRIDE;
-  virtual aura::Window* GetFocusedWindow() OVERRIDE;
+  void AddObserver(aura::client::FocusChangeObserver* observer) override;
+  void RemoveObserver(aura::client::FocusChangeObserver* observer) override;
+  void FocusWindow(aura::Window* window) override;
+  void ResetFocusWithinActiveWindow(aura::Window* window) override;
+  aura::Window* GetFocusedWindow() override;
 
   // Overridden from ui::EventHandler:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
-  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  void OnKeyEvent(ui::KeyEvent* event) override;
+  void OnMouseEvent(ui::MouseEvent* event) override;
+  void OnScrollEvent(ui::ScrollEvent* event) override;
+  void OnTouchEvent(ui::TouchEvent* event) override;
+  void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowVisibilityChanged(aura::Window* window,
-                                         bool visible) OVERRIDE;
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
-  virtual void OnWindowHierarchyChanging(
-      const HierarchyChangeParams& params) OVERRIDE;
-  virtual void OnWindowHierarchyChanged(
-      const HierarchyChangeParams& params) OVERRIDE;
+  void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
+  void OnWindowDestroying(aura::Window* window) override;
+  void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
+  void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override;
 
   // Internal implementation that sets the focused window, fires events etc.
   // This function must be called with a valid focusable window.