chrome/browser/status_icons/status_icon_menu_model.h - Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/status_icons/status_icon_menu_model.h

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/status_icons/desktop_notification_balloon.cc ('k') | chrome/browser/status_icons/status_icon_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/status_icons/status_icon_menu_model.h

diff --git a/chrome/browser/status_icons/status_icon_menu_model.h b/chrome/browser/status_icons/status_icon_menu_model.h

index fa4387494a2f3af4bf83fd5db5f76a3e9e1bd700..bb9185fcd716661b8960b04185b8f72fb522d3a5 100644

--- a/chrome/browser/status_icons/status_icon_menu_model.h

+++ b/chrome/browser/status_icons/status_icon_menu_model.h

@@ -77,20 +77,20 @@ class StatusIconMenuModel

void RemoveObserver(Observer* observer);

// Overridden from ui::SimpleMenuModel::Delegate:

- virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;

- virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;

- virtual bool IsCommandIdVisible(int command_id) const OVERRIDE;

+ virtual bool IsCommandIdChecked(int command_id) const override;

+ virtual bool IsCommandIdEnabled(int command_id) const override;

+ virtual bool IsCommandIdVisible(int command_id) const override;

virtual bool GetAcceleratorForCommandId(

- int command_id, ui::Accelerator* accelerator) OVERRIDE;

- virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;

- virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;

- virtual base::string16 GetSublabelForCommandId(int command_id) const OVERRIDE;

+ int command_id, ui::Accelerator* accelerator) override;

+ virtual bool IsItemForCommandIdDynamic(int command_id) const override;

+ virtual base::string16 GetLabelForCommandId(int command_id) const override;

+ virtual base::string16 GetSublabelForCommandId(int command_id) const override;

virtual bool GetIconForCommandId(int command_id, gfx::Image* icon) const

- OVERRIDE;

+ override;

protected:

// Overriden from ui::SimpleMenuModel:

- virtual void MenuItemsChanged() OVERRIDE;

+ virtual void MenuItemsChanged() override;

void NotifyMenuStateChanged();

@@ -99,8 +99,8 @@ class StatusIconMenuModel

private:

// Overridden from ui::SimpleMenuModel::Delegate:

- virtual void CommandIdHighlighted(int command_id) OVERRIDE;

- virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;

+ virtual void CommandIdHighlighted(int command_id) override;

+ virtual void ExecuteCommand(int command_id, int event_flags) override;

struct ItemState;