Index: ui/base/cocoa/menu_controller_unittest.mm |
diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm |
index 56e610e92a77497e87dce7a9ccdb2b5bb36d5251..161bf28bbed7f898edebfdf5147634ee6c19521c 100644 |
--- a/ui/base/cocoa/menu_controller_unittest.mm |
+++ b/ui/base/cocoa/menu_controller_unittest.mm |
@@ -39,21 +39,21 @@ class Delegate : public SimpleMenuModel::Delegate { |
did_close_(false) { |
} |
- virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { |
+ virtual bool IsCommandIdChecked(int command_id) const override { |
return false; |
} |
- virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { |
+ virtual bool IsCommandIdEnabled(int command_id) const override { |
++enable_count_; |
return true; |
} |
virtual bool GetAcceleratorForCommandId( |
int command_id, |
- Accelerator* accelerator) OVERRIDE { return false; } |
- virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE { |
+ Accelerator* accelerator) override { return false; } |
+ virtual void ExecuteCommand(int command_id, int event_flags) override { |
++execute_count_; |
} |
- virtual void MenuWillShow(SimpleMenuModel* /*source*/) OVERRIDE { |
+ virtual void MenuWillShow(SimpleMenuModel* /*source*/) override { |
EXPECT_FALSE(did_show_); |
EXPECT_FALSE(did_close_); |
did_show_ = true; |
@@ -66,7 +66,7 @@ class Delegate : public SimpleMenuModel::Delegate { |
inModes:modes]; |
} |
- virtual void MenuClosed(SimpleMenuModel* /*source*/) OVERRIDE { |
+ virtual void MenuClosed(SimpleMenuModel* /*source*/) override { |
EXPECT_TRUE(did_show_); |
EXPECT_FALSE(did_close_); |
did_close_ = true; |
@@ -86,15 +86,15 @@ class Delegate : public SimpleMenuModel::Delegate { |
class DynamicDelegate : public Delegate { |
public: |
DynamicDelegate() {} |
- virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE { |
+ virtual bool IsItemForCommandIdDynamic(int command_id) const override { |
return true; |
} |
- virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE { |
+ virtual base::string16 GetLabelForCommandId(int command_id) const override { |
return label_; |
} |
virtual bool GetIconForCommandId( |
int command_id, |
- gfx::Image* icon) const OVERRIDE { |
+ gfx::Image* icon) const override { |
if (icon_.IsEmpty()) { |
return false; |
} else { |
@@ -121,7 +121,7 @@ class FontListMenuModel : public SimpleMenuModel { |
index_(index) { |
} |
virtual ~FontListMenuModel() {} |
- virtual const gfx::FontList* GetLabelFontListAt(int index) const OVERRIDE { |
+ virtual const gfx::FontList* GetLabelFontListAt(int index) const override { |
return (index == index_) ? font_list_ : NULL; |
} |