Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / aura / window_event_dispatcher.h

diff --git a/src/ui/aura/window_event_dispatcher.h b/src/ui/aura/window_event_dispatcher.h
index 8494123..6b1cadc 100644 (file)
--- a/src/ui/aura/window_event_dispatcher.h
+++ b/src/ui/aura/window_event_dispatcher.h
@@ -61,7 +61,7 @@ class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor,
                                           public EnvObserver {
  public:
   explicit WindowEventDispatcher(WindowTreeHost* host);
-  virtual ~WindowEventDispatcher();
+  ~WindowEventDispatcher() override;
 
   Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
   Window* mouse_moved_handler() { return mouse_moved_handler_; }
@@ -168,44 +168,43 @@ class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor,
   Window* GetGestureTarget(ui::GestureEvent* event);
 
   // Overridden from aura::client::CaptureDelegate:
-  virtual void UpdateCapture(Window* old_capture, Window* new_capture) OVERRIDE;
-  virtual void OnOtherRootGotCapture() OVERRIDE;
-  virtual void SetNativeCapture() OVERRIDE;
-  virtual void ReleaseNativeCapture() OVERRIDE;
+  void UpdateCapture(Window* old_capture, Window* new_capture) override;
+  void OnOtherRootGotCapture() override;
+  void SetNativeCapture() override;
+  void ReleaseNativeCapture() override;
 
   // Overridden from ui::EventProcessor:
-  virtual ui::EventTarget* GetRootTarget() OVERRIDE;
-  virtual void PrepareEventForDispatch(ui::Event* event) OVERRIDE;
+  ui::EventTarget* GetRootTarget() override;
+  void OnEventProcessingStarted(ui::Event* event) override;
 
   // Overridden from ui::EventDispatcherDelegate.
-  virtual bool CanDispatchToTarget(ui::EventTarget* target) OVERRIDE;
-  virtual ui::EventDispatchDetails PreDispatchEvent(ui::EventTarget* target,
-                                                    ui::Event* event) OVERRIDE;
-  virtual ui::EventDispatchDetails PostDispatchEvent(
-      ui::EventTarget* target, const ui::Event& event) OVERRIDE;
+  bool CanDispatchToTarget(ui::EventTarget* target) override;
+  ui::EventDispatchDetails PreDispatchEvent(ui::EventTarget* target,
+                                            ui::Event* event) override;
+  ui::EventDispatchDetails PostDispatchEvent(ui::EventTarget* target,
+                                             const ui::Event& event) override;
 
   // Overridden from ui::GestureEventHelper.
-  virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
-  virtual void DispatchGestureEvent(ui::GestureEvent* event) OVERRIDE;
-  virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
+  bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
+  void DispatchGestureEvent(ui::GestureEvent* event) override;
+  void DispatchCancelTouchEvent(ui::TouchEvent* event) override;
 
   // Overridden from WindowObserver:
-  virtual void OnWindowDestroying(Window* window) OVERRIDE;
-  virtual void OnWindowDestroyed(Window* window) OVERRIDE;
-  virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE;
-  virtual void OnWindowRemovingFromRootWindow(Window* window,
-                                              Window* new_root) OVERRIDE;
-  virtual void OnWindowVisibilityChanging(Window* window,
-                                          bool visible) OVERRIDE;
-  virtual void OnWindowVisibilityChanged(Window* window, bool visible) OVERRIDE;
-  virtual void OnWindowBoundsChanged(Window* window,
-                                     const gfx::Rect& old_bounds,
-                                     const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnWindowTransforming(Window* window) OVERRIDE;
-  virtual void OnWindowTransformed(Window* window) OVERRIDE;
+  void OnWindowDestroying(Window* window) override;
+  void OnWindowDestroyed(Window* window) override;
+  void OnWindowAddedToRootWindow(Window* window) override;
+  void OnWindowRemovingFromRootWindow(Window* window,
+                                      Window* new_root) override;
+  void OnWindowVisibilityChanging(Window* window, bool visible) override;
+  void OnWindowVisibilityChanged(Window* window, bool visible) override;
+  void OnWindowBoundsChanged(Window* window,
+                             const gfx::Rect& old_bounds,
+                             const gfx::Rect& new_bounds) override;
+  void OnWindowTransforming(Window* window) override;
+  void OnWindowTransformed(Window* window) override;
 
   // Overridden from EnvObserver:
-  virtual void OnWindowInitialized(Window* window) OVERRIDE;
+  void OnWindowInitialized(Window* window) override;
 
   // We hold and aggregate mouse drags and touch moves as a way of throttling
   // resizes when HoldMouseMoves() is called. The following methods are used to