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

Unified Diff: ui/views/color_chooser/color_chooser_view.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
« no previous file with comments | « ui/views/color_chooser/color_chooser_view.h ('k') | ui/views/controls/button/blue_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/color_chooser/color_chooser_view.cc
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index 8efdb2ad2f7cc5398985ec77fb9d69781b3a375b..680fd3063d4954e98ca48a5c297109af4f2e298b 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -66,17 +66,17 @@ class LocatedEventHandlerView : public views::View {
virtual void ProcessEventAtLocation(const gfx::Point& location) = 0;
// views::View overrides:
- virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
+ virtual bool OnMousePressed(const ui::MouseEvent& event) override {
ProcessEventAtLocation(event.location());
return true;
}
- virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE {
+ virtual bool OnMouseDragged(const ui::MouseEvent& event) override {
ProcessEventAtLocation(event.location());
return true;
}
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+ virtual void OnGestureEvent(ui::GestureEvent* event) override {
if (event->type() == ui::ET_GESTURE_TAP ||
event->type() == ui::ET_GESTURE_TAP_DOWN ||
event->IsScrollGestureEvent()) {
@@ -123,11 +123,11 @@ class ColorChooserView::HueView : public LocatedEventHandlerView {
private:
// LocatedEventHandlerView overrides:
- virtual void ProcessEventAtLocation(const gfx::Point& point) OVERRIDE;
+ virtual void ProcessEventAtLocation(const gfx::Point& point) override;
// View overrides:
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual void OnPaint(gfx::Canvas* canvas) override;
ColorChooserView* chooser_view_;
int level_;
@@ -235,11 +235,11 @@ class ColorChooserView::SaturationValueView : public LocatedEventHandlerView {
private:
// LocatedEventHandlerView overrides:
- virtual void ProcessEventAtLocation(const gfx::Point& point) OVERRIDE;
+ virtual void ProcessEventAtLocation(const gfx::Point& point) override;
// View overrides:
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual void OnPaint(gfx::Canvas* canvas) override;
ColorChooserView* chooser_view_;
SkScalar hue_;
« no previous file with comments | « ui/views/color_chooser/color_chooser_view.h ('k') | ui/views/controls/button/blue_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698