Index: ash/shell_unittest.cc |
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc |
index 160d2957110dbda8ec84c209e50ca5d8b8b19c22..ab09f9a9707497f10bc199f397fd44187dbd9835 100644 |
--- a/ash/shell_unittest.cc |
+++ b/ash/shell_unittest.cc |
@@ -92,21 +92,15 @@ void ExpectAllContainers() { |
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); |
@@ -115,24 +109,18 @@ class ModalWindow : public views::WidgetDelegateView { |
class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate { |
public: |
SimpleMenuDelegate() {} |
- virtual ~SimpleMenuDelegate() {} |
+ ~SimpleMenuDelegate() override {} |
- virtual bool IsCommandIdChecked(int command_id) const override { |
- return false; |
- } |
+ bool IsCommandIdChecked(int command_id) const override { return false; } |
- virtual bool IsCommandIdEnabled(int command_id) const override { |
- return true; |
- } |
+ bool IsCommandIdEnabled(int command_id) const override { return true; } |
- virtual bool GetAcceleratorForCommandId( |
- int command_id, |
- ui::Accelerator* accelerator) override { |
+ 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); |
@@ -279,9 +267,7 @@ class TestModalDialogDelegate : public views::DialogDelegateView { |
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) { |
@@ -525,7 +511,7 @@ TEST_F(ShellTest, EnvPreTargetHandler) { |
class ShellTest2 : public test::AshTestBase { |
public: |
ShellTest2() {} |
- virtual ~ShellTest2() {} |
+ ~ShellTest2() override {} |
protected: |
scoped_ptr<aura::Window> window_; |