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

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

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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
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 f8a40e9fcc39538a5509e73a101308f6b9f768c6..58f8eba2cf15eed9c3b8c47f98fb5c369f244bdd 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -36,29 +36,29 @@ 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;
+ 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;
// 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 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;
+ override;
// views::ContextMenuController:
virtual void ShowContextMenuForView(View* source,
const gfx::Point& point,
- ui::MenuSourceType source_type) OVERRIDE;
+ 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;
+ virtual 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_button_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698