| Index: ash/wm/workspace/multi_window_resize_controller.cc
|
| diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
|
| index 1a2f652683494db89da5a55596693e5f3d055a9d..09e3a1678956f14af8d8b61b4f91e2adcddc8c69 100644
|
| --- a/ash/wm/workspace/multi_window_resize_controller.cc
|
| +++ b/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);
|
| }
|
|
|
|
|