| Index: chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
|
| diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
|
| index abc57b091eeb812633d8c27569832e23379fbe37..ad6bd14245e47ba77ccd61837a94535d8809b0a2 100644
|
| --- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
|
| +++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
|
| @@ -32,15 +32,15 @@ class MenuError : public GlobalError {
|
|
|
| int execute_count() { return execute_count_; }
|
|
|
| - virtual bool HasMenuItem() OVERRIDE { return true; }
|
| - virtual int MenuItemCommandID() OVERRIDE { return command_id_; }
|
| - virtual base::string16 MenuItemLabel() OVERRIDE { return base::string16(); }
|
| - virtual void ExecuteMenuItem(Browser* browser) OVERRIDE { execute_count_++; }
|
| + virtual bool HasMenuItem() override { return true; }
|
| + virtual int MenuItemCommandID() override { return command_id_; }
|
| + virtual base::string16 MenuItemLabel() override { return base::string16(); }
|
| + virtual void ExecuteMenuItem(Browser* browser) override { execute_count_++; }
|
|
|
| - virtual bool HasBubbleView() OVERRIDE { return false; }
|
| - virtual bool HasShownBubbleView() OVERRIDE { return false; }
|
| - virtual void ShowBubbleView(Browser* browser) OVERRIDE { ADD_FAILURE(); }
|
| - virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE { return NULL; }
|
| + virtual bool HasBubbleView() override { return false; }
|
| + virtual bool HasShownBubbleView() override { return false; }
|
| + virtual void ShowBubbleView(Browser* browser) override { ADD_FAILURE(); }
|
| + virtual GlobalErrorBubbleViewBase* GetBubbleView() override { return NULL; }
|
|
|
| private:
|
| int command_id_;
|
| @@ -57,10 +57,10 @@ class WrenchMenuModelTest : public BrowserWithTestWindowTest,
|
| // Don't handle accelerators.
|
| virtual bool GetAcceleratorForCommandId(
|
| int command_id,
|
| - ui::Accelerator* accelerator) OVERRIDE { return false; }
|
| + ui::Accelerator* accelerator) override { return false; }
|
|
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| prefs_.reset(new TestingPrefServiceSimple());
|
| chrome::RegisterLocalState(prefs_->registry());
|
|
|
| @@ -69,7 +69,7 @@ class WrenchMenuModelTest : public BrowserWithTestWindowTest,
|
| BrowserWithTestWindowTest::SetUp();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| BrowserWithTestWindowTest::TearDown();
|
| testing_io_thread_state_.reset();
|
| TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
|
| @@ -95,19 +95,19 @@ class TestWrenchMenuModel : public WrenchMenuModel {
|
| }
|
|
|
| // Testing overrides to ui::SimpleMenuModel::Delegate:
|
| - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
|
| + virtual bool IsCommandIdChecked(int command_id) const override {
|
| bool val = WrenchMenuModel::IsCommandIdChecked(command_id);
|
| if (val)
|
| checked_count_++;
|
| return val;
|
| }
|
|
|
| - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
|
| + virtual bool IsCommandIdEnabled(int command_id) const override {
|
| ++enable_count_;
|
| return true;
|
| }
|
|
|
| - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {
|
| + virtual void ExecuteCommand(int command_id, int event_flags) override {
|
| ++execute_count_;
|
| }
|
|
|
|
|