diff options
Diffstat (limited to 'chromium/ui/views/controls/menu/menu_model_adapter.h')
| -rw-r--r-- | chromium/ui/views/controls/menu/menu_model_adapter.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/ui/views/controls/menu/menu_model_adapter.h b/chromium/ui/views/controls/menu/menu_model_adapter.h index 4db9dbe2cf9..353d010c533 100644 --- a/chromium/ui/views/controls/menu/menu_model_adapter.h +++ b/chromium/ui/views/controls/menu/menu_model_adapter.h @@ -67,10 +67,11 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate { virtual bool IsTriggerableEvent(MenuItemView* source, const ui::Event& e) OVERRIDE; virtual bool GetAccelerator(int id, - ui::Accelerator* accelerator) OVERRIDE; - virtual string16 GetLabel(int id) const OVERRIDE; - virtual const gfx::Font* GetLabelFont(int id) const 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; |