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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_button.h

Issue 680053003: 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 | « chrome/browser/ui/views/toolbar/reload_button.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_button.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h
index 58f8eba2cf15eed9c3b8c47f98fb5c369f244bdd..ad52183a081536f3e25cbbdc19f33321a821130b 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -25,7 +25,7 @@ class ToolbarButton : public views::LabelButton,
// Takes ownership of the |model|, which can be null if no menu
// is to be shown.
ToolbarButton(views::ButtonListener* listener, ui::MenuModel* model);
- virtual ~ToolbarButton();
+ ~ToolbarButton() override;
// Set up basic mouseover border behavior.
// Should be called before first paint.
@@ -36,29 +36,28 @@ class ToolbarButton : public views::LabelButton,
bool IsMenuShowing() const;
// views::LabelButton:
- virtual gfx::Size GetPreferredSize() const override;
- virtual bool OnMousePressed(const ui::MouseEvent& event) override;
- virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
- virtual void OnMouseReleased(const ui::MouseEvent& event) override;
+ gfx::Size GetPreferredSize() const override;
+ bool OnMousePressed(const ui::MouseEvent& event) override;
+ bool OnMouseDragged(const ui::MouseEvent& event) override;
+ void OnMouseReleased(const ui::MouseEvent& event) override;
// Showing the drop down results in a MouseCaptureLost, we need to ignore it.
- virtual void OnMouseCaptureLost() override;
- virtual void OnMouseExited(const ui::MouseEvent& event) override;
- virtual void OnGestureEvent(ui::GestureEvent* event) override;
- virtual void GetAccessibleState(ui::AXViewState* state) override;
- virtual scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const
- override;
+ void OnMouseCaptureLost() override;
+ void OnMouseExited(const ui::MouseEvent& event) override;
+ void OnGestureEvent(ui::GestureEvent* event) override;
+ void GetAccessibleState(ui::AXViewState* state) override;
+ scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override;
// views::ContextMenuController:
- virtual void ShowContextMenuForView(View* source,
- const gfx::Point& point,
- ui::MenuSourceType source_type) override;
+ void ShowContextMenuForView(View* source,
+ const gfx::Point& point,
+ ui::MenuSourceType source_type) override;
protected:
// Overridden from CustomButton. Returns true if the button should become
// pressed when a user holds the mouse down over the button. For this
// implementation, both left and right mouse buttons can trigger a change
// to the PUSHED state.
- virtual bool ShouldEnterPushedState(const ui::Event& event) override;
+ bool ShouldEnterPushedState(const ui::Event& event) override;
// Returns if menu should be shown. Override this to change default behavior.
virtual bool ShouldShowMenu();
« no previous file with comments | « chrome/browser/ui/views/toolbar/reload_button.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698