Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / wm / workspace / multi_window_resize_controller.cc

diff --git a/src/ash/wm/workspace/multi_window_resize_controller.cc b/src/ash/wm/workspace/multi_window_resize_controller.cc
index 34af90b..09e3a16 100644 (file)
--- a/src/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/src/ash/wm/workspace/multi_window_resize_controller.cc
@@ -71,32 +71,29 @@ class MultiWindowResizeController::ResizeView : public views::View {
   }
 
   // views::View overrides:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  gfx::Size GetPreferredSize() const override {
     return gfx::Size(image_->width(), image_->height());
   }
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+  void OnPaint(gfx::Canvas* canvas) override {
     canvas->DrawImageInt(*image_, 0, 0);
   }
-  virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
+  bool OnMousePressed(const ui::MouseEvent& event) override {
     gfx::Point location(event.location());
     views::View::ConvertPointToScreen(this, &location);
     controller_->StartResize(location);
     return true;
   }
-  virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE {
+  bool OnMouseDragged(const ui::MouseEvent& event) override {
     gfx::Point location(event.location());
     views::View::ConvertPointToScreen(this, &location);
     controller_->Resize(location, event.flags());
     return true;
   }
-  virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE {
+  void OnMouseReleased(const ui::MouseEvent& event) override {
     controller_->CompleteResize();
   }
-  virtual void OnMouseCaptureLost() OVERRIDE {
-    controller_->CancelResize();
-  }
-  virtual gfx::NativeCursor GetCursor(
-      const ui::MouseEvent& event) OVERRIDE {
+  void OnMouseCaptureLost() override { controller_->CancelResize(); }
+  gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override {
     int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM;
     return ::wm::CompoundEventFilter::CursorForWindowComponent(
         component);
@@ -118,8 +115,8 @@ class MultiWindowResizeController::ResizeMouseWatcherHost :
   ResizeMouseWatcherHost(MultiWindowResizeController* host) : host_(host) {}
 
   // MouseWatcherHost overrides:
-  virtual bool Contains(const gfx::Point& point_in_screen,
-                        MouseEventType type) OVERRIDE {
+  bool Contains(const gfx::Point& point_in_screen,
+                MouseEventType type) override {
     return host_->IsOverWindows(point_in_screen);
   }