| Index: chrome/browser/ui/toolbar/wrench_menu_model.h
|
| diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h
|
| index 965baf89a1026a94460dc69cdc9e7b635e036952..d7919261170e648353ed0674d1d0e00a80ba9434 100644
|
| --- a/chrome/browser/ui/toolbar/wrench_menu_model.h
|
| +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h
|
| @@ -32,12 +32,12 @@ class EncodingMenuModel : public ui::SimpleMenuModel,
|
| virtual ~EncodingMenuModel();
|
|
|
| // Overridden from ui::SimpleMenuModel::Delegate:
|
| - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
|
| - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
|
| + virtual bool IsCommandIdChecked(int command_id) const override;
|
| + virtual bool IsCommandIdEnabled(int command_id) const override;
|
| virtual bool GetAcceleratorForCommandId(
|
| int command_id,
|
| - ui::Accelerator* accelerator) OVERRIDE;
|
| - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
|
| + ui::Accelerator* accelerator) override;
|
| + virtual void ExecuteCommand(int command_id, int event_flags) override;
|
|
|
| private:
|
| void Build();
|
| @@ -93,36 +93,36 @@ class WrenchMenuModel : public ui::SimpleMenuModel,
|
| virtual ~WrenchMenuModel();
|
|
|
| // Overridden for ButtonMenuItemModel::Delegate:
|
| - virtual bool DoesCommandIdDismissMenu(int command_id) const OVERRIDE;
|
| + virtual bool DoesCommandIdDismissMenu(int command_id) const override;
|
|
|
| // Overridden for both ButtonMenuItemModel::Delegate and SimpleMenuModel:
|
| - virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
|
| - virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
|
| + virtual bool IsItemForCommandIdDynamic(int command_id) const override;
|
| + virtual base::string16 GetLabelForCommandId(int command_id) const override;
|
| virtual bool GetIconForCommandId(int command_id,
|
| - gfx::Image* icon) const OVERRIDE;
|
| - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
|
| - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
|
| - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
|
| - virtual bool IsCommandIdVisible(int command_id) const OVERRIDE;
|
| + gfx::Image* icon) const override;
|
| + virtual void ExecuteCommand(int command_id, int event_flags) override;
|
| + virtual bool IsCommandIdChecked(int command_id) const override;
|
| + virtual bool IsCommandIdEnabled(int command_id) const override;
|
| + virtual bool IsCommandIdVisible(int command_id) const override;
|
| virtual bool GetAcceleratorForCommandId(
|
| int command_id,
|
| - ui::Accelerator* accelerator) OVERRIDE;
|
| + ui::Accelerator* accelerator) override;
|
|
|
| // Overridden from TabStripModelObserver:
|
| virtual void ActiveTabChanged(content::WebContents* old_contents,
|
| content::WebContents* new_contents,
|
| int index,
|
| - int reason) OVERRIDE;
|
| + int reason) override;
|
| virtual void TabReplacedAt(TabStripModel* tab_strip_model,
|
| content::WebContents* old_contents,
|
| content::WebContents* new_contents,
|
| - int index) OVERRIDE;
|
| - virtual void TabStripModelDeleted() OVERRIDE;
|
| + int index) override;
|
| + virtual void TabStripModelDeleted() override;
|
|
|
| // Overridden from content::NotificationObserver:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| + const content::NotificationDetails& details) override;
|
|
|
| // Getters.
|
| Browser* browser() const { return browser_; }
|
|
|