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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.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_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index 5b895324f640c2e48198b42386526bdc47e56e00..8bb6b08bcd4a0484bcff8517e9a6bbe2d2652306 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -107,58 +107,58 @@ class ToolbarView : public views::AccessiblePaneView,
HomeButton* home_button() const { return home_; }
// AccessiblePaneView:
- virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+ virtual bool SetPaneFocus(View* initial_focus) override;
+ virtual void GetAccessibleState(ui::AXViewState* state) override;
// views::MenuButtonListener:
virtual void OnMenuButtonClicked(views::View* source,
- const gfx::Point& point) OVERRIDE;
+ const gfx::Point& point) override;
// LocationBarView::Delegate:
- virtual content::WebContents* GetWebContents() OVERRIDE;
- virtual ToolbarModel* GetToolbarModel() OVERRIDE;
- virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
- virtual InstantController* GetInstant() OVERRIDE;
+ virtual content::WebContents* GetWebContents() override;
+ virtual ToolbarModel* GetToolbarModel() override;
+ virtual const ToolbarModel* GetToolbarModel() const override;
+ virtual InstantController* GetInstant() override;
virtual views::Widget* CreateViewsBubble(
- views::BubbleDelegateView* bubble_delegate) OVERRIDE;
+ views::BubbleDelegateView* bubble_delegate) override;
virtual PageActionImageView* CreatePageActionImageView(
- LocationBarView* owner, ExtensionAction* action) OVERRIDE;
+ LocationBarView* owner, ExtensionAction* action) override;
virtual ContentSettingBubbleModelDelegate*
- GetContentSettingBubbleModelDelegate() OVERRIDE;
+ GetContentSettingBubbleModelDelegate() override;
virtual void ShowWebsiteSettings(content::WebContents* web_contents,
const GURL& url,
- const content::SSLStatus& ssl) OVERRIDE;
+ const content::SSLStatus& ssl) override;
// CommandObserver:
- virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
+ virtual void EnabledStateChangedForCommand(int id, bool enabled) override;
// views::ButtonListener:
virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE;
+ const ui::Event& event) override;
// views::WidgetObserver:
virtual void OnWidgetVisibilityChanged(views::Widget* widget,
- bool visible) OVERRIDE;
+ bool visible) override;
virtual void OnWidgetActivationChanged(views::Widget* widget,
- bool active) OVERRIDE;
+ bool active) override;
// content::NotificationObserver:
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ const content::NotificationDetails& details) override;
// ui::AcceleratorProvider:
virtual bool GetAcceleratorForCommandId(
- int command_id, ui::Accelerator* accelerator) OVERRIDE;
+ int command_id, ui::Accelerator* accelerator) override;
// views::View:
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual gfx::Size GetMinimumSize() const OVERRIDE;
- virtual void Layout() OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
- virtual void OnThemeChanged() OVERRIDE;
- virtual const char* GetClassName() const OVERRIDE;
- virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual gfx::Size GetMinimumSize() const override;
+ virtual void Layout() override;
+ virtual void OnPaint(gfx::Canvas* canvas) override;
+ virtual void OnThemeChanged() override;
+ virtual const char* GetClassName() const override;
+ virtual bool AcceleratorPressed(const ui::Accelerator& acc) override;
// Whether the wrench/hotdogs menu is currently showing.
bool IsWrenchMenuShowing() const;
@@ -179,8 +179,8 @@ class ToolbarView : public views::AccessiblePaneView,
protected:
// AccessiblePaneView:
- virtual bool SetPaneFocusAndFocusDefault() OVERRIDE;
- virtual void RemovePaneFocus() OVERRIDE;
+ virtual bool SetPaneFocusAndFocusDefault() override;
+ virtual void RemovePaneFocus() override;
private:
// Types of display mode this toolbar can have.
@@ -192,12 +192,12 @@ class ToolbarView : public views::AccessiblePaneView,
// views::ViewTargeterDelegate:
virtual bool DoesIntersectRect(const views::View* target,
- const gfx::Rect& rect) const OVERRIDE;
+ const gfx::Rect& rect) const override;
// WrenchMenuBadgeController::Delegate:
virtual void UpdateBadgeSeverity(WrenchMenuBadgeController::BadgeType type,
WrenchIconPainter::Severity severity,
- bool animate) OVERRIDE;
+ bool animate) override;
// Returns the number of pixels above the location bar in non-normal display.
int PopupTopSpacing() const;

Powered by Google App Engine
This is Rietveld 408576698