ui/views/controls/menu/menu_model_adapter.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

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: ui/views/controls/menu/menu_model_adapter.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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 | « ui/views/controls/menu/menu_message_pump_dispatcher_win.h ('k') | ui/views/controls/menu/menu_model_adapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/menu/menu_model_adapter.h

diff --git a/ui/views/controls/menu/menu_model_adapter.h b/ui/views/controls/menu/menu_model_adapter.h

index 353d010c533efcd93fa2e810874fac00b87bbf7d..54ce037e30361fef0b0dab4b190919a97fe6edce 100644

--- a/ui/views/controls/menu/menu_model_adapter.h

+++ b/ui/views/controls/menu/menu_model_adapter.h

@@ -62,20 +62,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {

int index);

// views::MenuDelegate implementation.

- virtual void ExecuteCommand(int id) OVERRIDE;

- virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE;

+ virtual void ExecuteCommand(int id) override;

+ virtual void ExecuteCommand(int id, int mouse_event_flags) override;

virtual bool IsTriggerableEvent(MenuItemView* source,

- const ui::Event& e) OVERRIDE;

+ const ui::Event& e) override;

virtual bool GetAccelerator(int id,

- ui::Accelerator* accelerator) const OVERRIDE;

- virtual base::string16 GetLabel(int id) const OVERRIDE;

- virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE;

- virtual bool IsCommandEnabled(int id) const OVERRIDE;

- virtual bool IsCommandVisible(int id) const OVERRIDE;

- virtual bool IsItemChecked(int id) const OVERRIDE;

- virtual void SelectionChanged(MenuItemView* menu) OVERRIDE;

- virtual void WillShowMenu(MenuItemView* menu) OVERRIDE;

- virtual void WillHideMenu(MenuItemView* menu) OVERRIDE;

+ ui::Accelerator* accelerator) const override;

+ virtual base::string16 GetLabel(int id) const override;

+ virtual const gfx::FontList* GetLabelFontList(int id) const override;

+ virtual bool IsCommandEnabled(int id) const override;

+ virtual bool IsCommandVisible(int id) const override;

+ virtual bool IsItemChecked(int id) const override;

+ virtual void SelectionChanged(MenuItemView* menu) override;

+ virtual void WillShowMenu(MenuItemView* menu) override;

+ virtual void WillHideMenu(MenuItemView* menu) override;

private:

// Implementation of BuildMenu().

« no previous file with comments | « ui/views/controls/menu/menu_message_pump_dispatcher_win.h ('k') | ui/views/controls/menu/menu_model_adapter_unittest.cc » ('j') | no next file with comments »