| Index: ui/base/models/simple_menu_model.h
|
| diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
|
| index f1238dd6862dc354375ba3be66244550c4e1ffe5..49403aabeeba87d1d237fca5ee409f20391e258c 100644
|
| --- a/ui/base/models/simple_menu_model.h
|
| +++ b/ui/base/models/simple_menu_model.h
|
| @@ -70,7 +70,7 @@ class UI_BASE_EXPORT SimpleMenuModel : public MenuModel {
|
| // The Delegate can be NULL, though if it is items can't be checked or
|
| // disabled.
|
| explicit SimpleMenuModel(Delegate* delegate);
|
| - virtual ~SimpleMenuModel();
|
| + ~SimpleMenuModel() override;
|
|
|
| // Methods for adding items to the model.
|
| void AddItem(int command_id, const base::string16& label);
|
| @@ -140,33 +140,31 @@ class UI_BASE_EXPORT SimpleMenuModel : public MenuModel {
|
| int GetIndexOfCommandId(int command_id);
|
|
|
| // Overridden from MenuModel:
|
| - virtual bool HasIcons() const override;
|
| - virtual int GetItemCount() const override;
|
| - virtual ItemType GetTypeAt(int index) const override;
|
| - virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override;
|
| - virtual int GetCommandIdAt(int index) const override;
|
| - virtual base::string16 GetLabelAt(int index) const override;
|
| - virtual base::string16 GetSublabelAt(int index) const override;
|
| - virtual base::string16 GetMinorTextAt(int index) const override;
|
| - virtual bool IsItemDynamicAt(int index) const override;
|
| - virtual bool GetAcceleratorAt(int index,
|
| - ui::Accelerator* accelerator) const override;
|
| - virtual bool IsItemCheckedAt(int index) const override;
|
| - virtual int GetGroupIdAt(int index) const override;
|
| - virtual bool GetIconAt(int index, gfx::Image* icon) override;
|
| - virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
|
| - int index) const override;
|
| - virtual bool IsEnabledAt(int index) const override;
|
| - virtual bool IsVisibleAt(int index) const override;
|
| - virtual void HighlightChangedTo(int index) override;
|
| - virtual void ActivatedAt(int index) override;
|
| - virtual void ActivatedAt(int index, int event_flags) override;
|
| - virtual MenuModel* GetSubmenuModelAt(int index) const override;
|
| - virtual void MenuWillShow() override;
|
| - virtual void MenuClosed() override;
|
| - virtual void SetMenuModelDelegate(
|
| + bool HasIcons() const override;
|
| + int GetItemCount() const override;
|
| + ItemType GetTypeAt(int index) const override;
|
| + ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override;
|
| + int GetCommandIdAt(int index) const override;
|
| + base::string16 GetLabelAt(int index) const override;
|
| + base::string16 GetSublabelAt(int index) const override;
|
| + base::string16 GetMinorTextAt(int index) const override;
|
| + bool IsItemDynamicAt(int index) const override;
|
| + bool GetAcceleratorAt(int index, ui::Accelerator* accelerator) const override;
|
| + bool IsItemCheckedAt(int index) const override;
|
| + int GetGroupIdAt(int index) const override;
|
| + bool GetIconAt(int index, gfx::Image* icon) override;
|
| + ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const override;
|
| + bool IsEnabledAt(int index) const override;
|
| + bool IsVisibleAt(int index) const override;
|
| + void HighlightChangedTo(int index) override;
|
| + void ActivatedAt(int index) override;
|
| + void ActivatedAt(int index, int event_flags) override;
|
| + MenuModel* GetSubmenuModelAt(int index) const override;
|
| + void MenuWillShow() override;
|
| + void MenuClosed() override;
|
| + void SetMenuModelDelegate(
|
| ui::MenuModelDelegate* menu_model_delegate) override;
|
| - virtual MenuModelDelegate* GetMenuModelDelegate() const override;
|
| + MenuModelDelegate* GetMenuModelDelegate() const override;
|
|
|
| protected:
|
| void set_delegate(Delegate* delegate) { delegate_ = delegate; }
|
|
|