Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / widget / desktop_aura / desktop_drag_drop_client_aurax11.h

diff --git a/src/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h b/src/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
index 8d30153..be1be54 100644 (file)
--- a/src/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
+++ b/src/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
@@ -59,7 +59,7 @@ class VIEWS_EXPORT DesktopDragDropClientAuraX11
       views::DesktopNativeCursorManager* cursor_manager,
       Display* xdisplay,
       ::Window xwindow);
-  virtual ~DesktopDragDropClientAuraX11();
+  ~DesktopDragDropClientAuraX11() override;
 
   // We maintain a mapping of live DesktopDragDropClientAuraX11 objects to
   // their ::Windows. We do this so that we're able to short circuit sending
@@ -80,27 +80,24 @@ class VIEWS_EXPORT DesktopDragDropClientAuraX11
   void OnSelectionNotify(const XSelectionEvent& xselection);
 
   // Overridden from aura::client::DragDropClient:
-  virtual int StartDragAndDrop(
-      const ui::OSExchangeData& data,
-      aura::Window* root_window,
-      aura::Window* source_window,
-      const gfx::Point& root_location,
-      int operation,
-      ui::DragDropTypes::DragEventSource source) OVERRIDE;
-  virtual void DragUpdate(aura::Window* target,
-                          const ui::LocatedEvent& event) OVERRIDE;
-  virtual void Drop(aura::Window* target,
-                    const ui::LocatedEvent& event) OVERRIDE;
-  virtual void DragCancel() OVERRIDE;
-  virtual bool IsDragDropInProgress() OVERRIDE;
+  int StartDragAndDrop(const ui::OSExchangeData& data,
+                       aura::Window* root_window,
+                       aura::Window* source_window,
+                       const gfx::Point& root_location,
+                       int operation,
+                       ui::DragDropTypes::DragEventSource source) override;
+  void DragUpdate(aura::Window* target, const ui::LocatedEvent& event) override;
+  void Drop(aura::Window* target, const ui::LocatedEvent& event) override;
+  void DragCancel() override;
+  bool IsDragDropInProgress() override;
 
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
+  void OnWindowDestroyed(aura::Window* window) override;
 
   // Overridden from X11WholeScreenMoveLoopDelegate:
-  virtual void OnMouseMovement(XMotionEvent* event) OVERRIDE;
-  virtual void OnMouseReleased() OVERRIDE;
-  virtual void OnMoveLoopEnded() OVERRIDE;
+  void OnMouseMovement(XMotionEvent* event) override;
+  void OnMouseReleased() override;
+  void OnMoveLoopEnded() override;
 
  protected:
   // The following methods are virtual for the sake of testing.