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

Side by Side Diff: ui/views/controls/scrollbar/native_scroll_bar_views.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_ 5 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_
6 #define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_ 6 #define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/gfx/point.h" 9 #include "ui/gfx/point.h"
10 #include "ui/native_theme/native_theme.h" 10 #include "ui/native_theme/native_theme.h"
(...skipping 16 matching lines...) Expand all
27 public NativeScrollBarWrapper { 27 public NativeScrollBarWrapper {
28 public: 28 public:
29 static const char kViewClassName[]; 29 static const char kViewClassName[];
30 30
31 // Creates new scrollbar, either horizontal or vertical. 31 // Creates new scrollbar, either horizontal or vertical.
32 explicit NativeScrollBarViews(NativeScrollBar* native_scroll_bar); 32 explicit NativeScrollBarViews(NativeScrollBar* native_scroll_bar);
33 virtual ~NativeScrollBarViews(); 33 virtual ~NativeScrollBarViews();
34 34
35 private: 35 private:
36 // View overrides: 36 // View overrides:
37 virtual void Layout() OVERRIDE; 37 virtual void Layout() override;
38 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 38 virtual void OnPaint(gfx::Canvas* canvas) override;
39 virtual gfx::Size GetPreferredSize() const OVERRIDE; 39 virtual gfx::Size GetPreferredSize() const override;
40 virtual const char* GetClassName() const OVERRIDE; 40 virtual const char* GetClassName() const override;
41 41
42 // ScrollBar overrides: 42 // ScrollBar overrides:
43 virtual int GetLayoutSize() const OVERRIDE; 43 virtual int GetLayoutSize() const override;
44 44
45 // BaseScrollBar overrides: 45 // BaseScrollBar overrides:
46 virtual void ScrollToPosition(int position) OVERRIDE; 46 virtual void ScrollToPosition(int position) override;
47 virtual int GetScrollIncrement(bool is_page, bool is_positive) OVERRIDE; 47 virtual int GetScrollIncrement(bool is_page, bool is_positive) override;
48 48
49 // BaseButton::ButtonListener overrides: 49 // BaseButton::ButtonListener overrides:
50 virtual void ButtonPressed(Button* sender, 50 virtual void ButtonPressed(Button* sender,
51 const ui::Event& event) OVERRIDE; 51 const ui::Event& event) override;
52 52
53 // NativeScrollBarWrapper overrides: 53 // NativeScrollBarWrapper overrides:
54 virtual int GetPosition() const OVERRIDE; 54 virtual int GetPosition() const override;
55 virtual View* GetView() OVERRIDE; 55 virtual View* GetView() override;
56 virtual void Update(int viewport_size, 56 virtual void Update(int viewport_size,
57 int content_size, 57 int content_size,
58 int current_pos) OVERRIDE; 58 int current_pos) override;
59 59
60 // Returns the area for the track. This is the area of the scrollbar minus 60 // Returns the area for the track. This is the area of the scrollbar minus
61 // the size of the arrow buttons. 61 // the size of the arrow buttons.
62 virtual gfx::Rect GetTrackBounds() const OVERRIDE; 62 virtual gfx::Rect GetTrackBounds() const override;
63 63
64 // The NativeScrollBar we are bound to. 64 // The NativeScrollBar we are bound to.
65 NativeScrollBar* native_scroll_bar_; 65 NativeScrollBar* native_scroll_bar_;
66 66
67 // The scroll bar buttons (Up/Down, Left/Right). 67 // The scroll bar buttons (Up/Down, Left/Right).
68 Button* prev_button_; 68 Button* prev_button_;
69 Button* next_button_; 69 Button* next_button_;
70 70
71 ui::NativeTheme::ExtraParams params_; 71 ui::NativeTheme::ExtraParams params_;
72 ui::NativeTheme::Part part_; 72 ui::NativeTheme::Part part_;
73 ui::NativeTheme::State state_; 73 ui::NativeTheme::State state_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(NativeScrollBarViews); 75 DISALLOW_COPY_AND_ASSIGN(NativeScrollBarViews);
76 }; 76 };
77 77
78 } // namespace views 78 } // namespace views
79 79
80 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_ 80 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_
OLDNEW
« no previous file with comments | « ui/views/controls/scrollbar/native_scroll_bar.h ('k') | ui/views/controls/scrollbar/native_scroll_bar_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698