Standardize usage of virtual/override/final specifiers.

ash/shell_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 74 matching lines @@
                                   kShellWindowId_ImeWindowParentContainer));
 #if defined(OS_CHROMEOS)
   EXPECT_TRUE(
       Shell::GetContainer(root_window, kShellWindowId_MouseCursorContainer));
 #endif
 }
 
 class ModalWindow : public views::WidgetDelegateView {
  public:
   ModalWindow() {}
-  virtual ~ModalWindow() {}
+  ~ModalWindow() override {}
 
   // Overridden from views::WidgetDelegate:
-  virtual views::View* GetContentsView() override {
-    return this;
-  }
-  virtual bool CanResize() const override {
-    return true;
-  }
-  virtual base::string16 GetWindowTitle() const override {
+  views::View* GetContentsView() override { return this; }
+  bool CanResize() const override { return true; }
+  base::string16 GetWindowTitle() const override {
     return base::ASCIIToUTF16("Modal Window");
   }
-  virtual ui::ModalType GetModalType() const override {
-    return ui::MODAL_TYPE_SYSTEM;
-  }
+  ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ModalWindow);
 };
 
 class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   SimpleMenuDelegate() {}
-  virtual ~SimpleMenuDelegate() {}
+  ~SimpleMenuDelegate() override {}
 
-  virtual bool IsCommandIdChecked(int command_id) const override {
+  bool IsCommandIdChecked(int command_id) const override { return false; }
+
+  bool IsCommandIdEnabled(int command_id) const override { return true; }
+
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override {
     return false;
   }
 
-  virtual bool IsCommandIdEnabled(int command_id) const override {
-    return true;
-  }
-
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      ui::Accelerator* accelerator) override {
-    return false;
-  }
-
-  virtual void ExecuteCommand(int command_id, int event_flags) override {
-  }
+  void ExecuteCommand(int command_id, int event_flags) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SimpleMenuDelegate);
 };
 
 }  // namespace
 
 class ShellTest : public test::AshTestBase {
  public:
   views::Widget* CreateTestWindow(views::Widget::InitParams params) {
@@ skipping 126 matching lines @@
 
   modal_widget->Close();
   widget->Close();
 }
 
 class TestModalDialogDelegate : public views::DialogDelegateView {
  public:
   TestModalDialogDelegate() {}
 
   // Overridden from views::WidgetDelegate:
-  virtual ui::ModalType GetModalType() const override {
-    return ui::MODAL_TYPE_SYSTEM;
-  }
+  ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
 };
 
 TEST_F(ShellTest, CreateLockScreenModalWindow) {
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
 
   // Create a normal window.
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
   EXPECT_TRUE(widget->GetNativeView()->HasFocus());
@@ skipping 223 matching lines @@
 // This verifies WindowObservers are removed when a window is destroyed after
 // the Shell is destroyed. This scenario (aura::Windows being deleted after the
 // Shell) occurs if someone is holding a reference to an unparented Window, as
 // is the case with a RenderWidgetHostViewAura that isn't on screen. As long as
 // everything is ok, we won't crash. If there is a bug, window's destructor will
 // notify some deleted object (say VideoDetector or ActivationController) and
 // this will crash.
 class ShellTest2 : public test::AshTestBase {
  public:
   ShellTest2() {}
-  virtual ~ShellTest2() {}
+  ~ShellTest2() override {}
 
  protected:
   scoped_ptr<aura::Window> window_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash