Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2416)

Unified Diff: ash/wm/workspace/multi_window_resize_controller.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 34af90b4b6f443a3395727d139e42ad4cc922d31..1a2f652683494db89da5a55596693e5f3d055a9d 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -71,32 +71,32 @@ class MultiWindowResizeController::ResizeView : public views::View {
}
// views::View overrides:
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
return gfx::Size(image_->width(), image_->height());
}
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ virtual void OnPaint(gfx::Canvas* canvas) override {
canvas->DrawImageInt(*image_, 0, 0);
}
- virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
+ virtual 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 {
+ virtual 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 {
+ virtual void OnMouseReleased(const ui::MouseEvent& event) override {
controller_->CompleteResize();
}
- virtual void OnMouseCaptureLost() OVERRIDE {
+ virtual void OnMouseCaptureLost() override {
controller_->CancelResize();
}
virtual gfx::NativeCursor GetCursor(
- const ui::MouseEvent& event) OVERRIDE {
+ const ui::MouseEvent& event) override {
int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM;
return ::wm::CompoundEventFilter::CursorForWindowComponent(
component);
@@ -119,7 +119,7 @@ class MultiWindowResizeController::ResizeMouseWatcherHost :
// MouseWatcherHost overrides:
virtual bool Contains(const gfx::Point& point_in_screen,
- MouseEventType type) OVERRIDE {
+ MouseEventType type) override {
return host_->IsOverWindows(point_in_screen);
}
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.h ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698