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

Unified Diff: ui/views/touchui/touch_selection_controller_impl.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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: ui/views/touchui/touch_selection_controller_impl.cc
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 4b097624988f5216d4477fff054a8ec97aade615..36b73d148acb928176352c7c40c2face95fb2c2d 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -138,7 +138,7 @@ class TouchHandleWindowTargeter : public wm::MaskedWindowTargeter {
private:
// wm::MaskedWindowTargeter:
virtual bool GetHitTestMask(aura::Window* window,
- gfx::Path* mask) const OVERRIDE;
+ gfx::Path* mask) const override;
EditingHandleView* handle_view_;
@@ -170,11 +170,11 @@ class TouchSelectionControllerImpl::EditingHandleView
}
// Overridden from views::WidgetDelegateView:
- virtual bool WidgetHasHitTestMask() const OVERRIDE {
+ virtual bool WidgetHasHitTestMask() const override {
return true;
}
- virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE {
+ virtual void GetWidgetHitTestMask(gfx::Path* mask) const override {
gfx::Size image_size = GetHandleImageSize();
mask->addRect(SkIntToScalar(0), SkIntToScalar(selection_rect_.height()),
SkIntToScalar(image_size.width()) + 2 * kSelectionHandleHorizPadding,
@@ -182,12 +182,12 @@ class TouchSelectionControllerImpl::EditingHandleView
kSelectionHandleVertPadding));
}
- virtual void DeleteDelegate() OVERRIDE {
+ virtual void DeleteDelegate() override {
// We are owned and deleted by TouchSelectionController.
}
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ virtual void OnPaint(gfx::Canvas* canvas) override {
if (draw_invisible_)
return;
gfx::Size image_size = GetHandleImageSize();
@@ -205,7 +205,7 @@ class TouchSelectionControllerImpl::EditingHandleView
kSelectionHandleHorizPadding, selection_rect_.height());
}
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+ virtual void OnGestureEvent(ui::GestureEvent* event) override {
event->SetHandled();
switch (event->type()) {
case ui::ET_GESTURE_SCROLL_BEGIN:
@@ -230,7 +230,7 @@ class TouchSelectionControllerImpl::EditingHandleView
}
}
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
gfx::Size image_size = GetHandleImageSize();
return gfx::Size(image_size.width() + 2 * kSelectionHandleHorizPadding,
image_size.height() + selection_rect_.height() +
« no previous file with comments | « ui/views/touchui/touch_selection_controller_impl.h ('k') | ui/views/touchui/touch_selection_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698