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

Unified Diff: ui/views/controls/menu/menu_model_adapter.h

Issue 683563002: 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
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 54ce037e30361fef0b0dab4b190919a97fe6edce..5fc9d3e8d909247c10696ecfafc69add0c4640c8 100644
--- a/ui/views/controls/menu/menu_model_adapter.h
+++ b/ui/views/controls/menu/menu_model_adapter.h
@@ -23,7 +23,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {
// The caller retains ownership of the ui::MenuModel instance and
// must ensure it exists for the lifetime of the adapter.
explicit MenuModelAdapter(ui::MenuModel* menu_model);
- virtual ~MenuModelAdapter();
+ ~MenuModelAdapter() override;
// Populate a MenuItemView menu with the ui::MenuModel items
// (including submenus).
@@ -62,20 +62,18 @@ 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 bool IsTriggerableEvent(MenuItemView* source,
- 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;
+ void ExecuteCommand(int id) override;
+ void ExecuteCommand(int id, int mouse_event_flags) override;
+ bool IsTriggerableEvent(MenuItemView* source, const ui::Event& e) override;
+ bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
+ base::string16 GetLabel(int id) const override;
+ const gfx::FontList* GetLabelFontList(int id) const override;
+ bool IsCommandEnabled(int id) const override;
+ bool IsCommandVisible(int id) const override;
+ bool IsItemChecked(int id) const override;
+ void SelectionChanged(MenuItemView* menu) override;
+ void WillShowMenu(MenuItemView* menu) override;
+ void WillHideMenu(MenuItemView* menu) override;
private:
// Implementation of BuildMenu().
« no previous file with comments | « ui/views/controls/menu/menu_message_loop_aura.cc ('k') | ui/views/controls/menu/menu_model_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698