| 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 32490add498fe5c62d43cc330381ba8c0de2a9c1..59b752fe1ba97f859bd74d7de10f878ea6e0ebda 100644
|
| --- a/ui/base/models/simple_menu_model.h
|
| +++ b/ui/base/models/simple_menu_model.h
|
| @@ -112,7 +112,7 @@ class SimpleMenuModel : public MenuModel {
|
| ui::Accelerator* accelerator) const;
|
| virtual bool IsItemCheckedAt(int index) const;
|
| virtual int GetGroupIdAt(int index) const;
|
| - virtual bool GetIconAt(int index, SkBitmap* icon) const;
|
| + virtual bool GetIconAt(int index, SkBitmap* icon);
|
| virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const;
|
| virtual bool IsEnabledAt(int index) const;
|
| virtual bool IsVisibleAt(int index) const;
|
| @@ -120,6 +120,7 @@ class SimpleMenuModel : public MenuModel {
|
| virtual void ActivatedAt(int index);
|
| virtual MenuModel* GetSubmenuModelAt(int index) const;
|
| virtual void MenuClosed();
|
| + virtual void SetMenuModelDelegate(ui::MenuModelDelegate* menu_model_delegate);
|
|
|
| protected:
|
| // Some variants of this model (SystemMenuModel) relies on items to be
|
| @@ -131,6 +132,8 @@ class SimpleMenuModel : public MenuModel {
|
|
|
| Delegate* delegate() { return delegate_; }
|
|
|
| + MenuModelDelegate* menu_model_delegate() { return menu_model_delegate_; }
|
| +
|
| private:
|
| struct Item;
|
|
|
| @@ -146,6 +149,8 @@ class SimpleMenuModel : public MenuModel {
|
|
|
| Delegate* delegate_;
|
|
|
| + MenuModelDelegate* menu_model_delegate_;
|
| +
|
| ScopedRunnableMethodFactory<SimpleMenuModel> method_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SimpleMenuModel);
|
|
|