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

Unified Diff: ui/views/controls/scrollbar/native_scroll_bar.h

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/controls/scrollbar/native_scroll_bar.h
diff --git a/ui/views/controls/scrollbar/native_scroll_bar.h b/ui/views/controls/scrollbar/native_scroll_bar.h
index 058784d55ac83d5cce4b2bd3eee950e0b679e8fd..85361112f9844fe73f0811b84625b859ed7a39bd 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar.h
+++ b/ui/views/controls/scrollbar/native_scroll_bar.h
@@ -40,25 +40,25 @@ class VIEWS_EXPORT NativeScrollBar : public ScrollBar {
FRIEND_TEST_ALL_PREFIXES(NativeScrollBarTest, Scrolling);
// Overridden from View.
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual void Layout() OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual void Layout() override;
virtual void ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) OVERRIDE;
- virtual const char* GetClassName() const OVERRIDE;
+ const ViewHierarchyChangedDetails& details) override;
+ virtual const char* GetClassName() const override;
// Overrideen from View for keyboard UI purpose.
- virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
- virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE;
+ virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
+ virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
// Overridden from ui::EventHandler.
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ virtual void OnGestureEvent(ui::GestureEvent* event) override;
// Overridden from ScrollBar.
virtual void Update(int viewport_size,
int content_size,
- int current_pos) OVERRIDE;
- virtual int GetPosition() const OVERRIDE;
- virtual int GetLayoutSize() const OVERRIDE;
+ int current_pos) override;
+ virtual int GetPosition() const override;
+ virtual int GetLayoutSize() const override;
// init border
NativeScrollBarWrapper* native_wrapper_;
« no previous file with comments | « ui/views/controls/scrollbar/kennedy_scroll_bar.cc ('k') | ui/views/controls/scrollbar/native_scroll_bar_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698