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

Unified Diff: ui/views/controls/scroll_view.h

Issue 681883002: Standardize usage of virtual/override/final specifiers. (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
« no previous file with comments | « ui/views/controls/resize_area.h ('k') | ui/views/controls/scroll_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/scroll_view.h
diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
index 4dfcdfc19b91d300b94f2305e636ceb47403cf66..c90005b3a4706bf488d0d7090d0fb347e9fc9d8b 100644
--- a/ui/views/controls/scroll_view.h
+++ b/ui/views/controls/scroll_view.h
@@ -32,7 +32,7 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
ScrollView();
- virtual ~ScrollView();
+ ~ScrollView() override;
// Creates a ScrollView with a theme specific border.
static ScrollView* CreateScrollViewWithBorder();
@@ -75,21 +75,21 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
void SetVerticalScrollBar(ScrollBar* vert_sb);
// View overrides:
- virtual gfx::Size GetPreferredSize() const override;
- virtual int GetHeightForWidth(int width) const override;
- virtual void Layout() override;
- virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
- virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
- virtual void OnMouseEntered(const ui::MouseEvent& event) override;
- virtual void OnMouseExited(const ui::MouseEvent& event) override;
- virtual void OnGestureEvent(ui::GestureEvent* event) override;
- virtual const char* GetClassName() const override;
+ gfx::Size GetPreferredSize() const override;
+ int GetHeightForWidth(int width) const override;
+ void Layout() override;
+ bool OnKeyPressed(const ui::KeyEvent& event) override;
+ bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
+ void OnMouseEntered(const ui::MouseEvent& event) override;
+ void OnMouseExited(const ui::MouseEvent& event) override;
+ void OnGestureEvent(ui::GestureEvent* event) override;
+ const char* GetClassName() const override;
// ScrollBarController overrides:
- virtual void ScrollToPosition(ScrollBar* source, int position) override;
- virtual int GetScrollIncrement(ScrollBar* source,
- bool is_page,
- bool is_positive) override;
+ void ScrollToPosition(ScrollBar* source, int position) override;
+ int GetScrollIncrement(ScrollBar* source,
+ bool is_page,
+ bool is_positive) override;
private:
FRIEND_TEST_ALL_PREFIXES(ScrollViewTest, CornerViewVisibility);
@@ -211,7 +211,7 @@ class FixedRowHeightScrollHelper : public VariableRowHeightScrollHelper {
protected:
// Calculates the bounds of the row from the top margin and row height.
- virtual RowInfo GetRowInfo(int y) override;
+ RowInfo GetRowInfo(int y) override;
private:
int top_margin_;
« no previous file with comments | « ui/views/controls/resize_area.h ('k') | ui/views/controls/scroll_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698