Index: ash/display/display_manager_unittest.cc |
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc |
index 1ce0045328b06c04dca6b6bdba4bd4768e934d92..b51c2fc295c10aaf68889a9bfaa79167b867607c 100644 |
--- a/ash/display/display_manager_unittest.cc |
+++ b/ash/display/display_manager_unittest.cc |
@@ -50,14 +50,14 @@ class DisplayManagerTest : public test::AshTestBase, |
: removed_count_(0U), |
root_window_destroyed_(false) { |
} |
- virtual ~DisplayManagerTest() {} |
+ ~DisplayManagerTest() override {} |
- virtual void SetUp() override { |
+ void SetUp() override { |
AshTestBase::SetUp(); |
Shell::GetScreen()->AddObserver(this); |
Shell::GetPrimaryRootWindow()->AddObserver(this); |
} |
- virtual void TearDown() override { |
+ void TearDown() override { |
Shell::GetPrimaryRootWindow()->RemoveObserver(this); |
Shell::GetScreen()->RemoveObserver(this); |
AshTestBase::TearDown(); |
@@ -102,19 +102,18 @@ class DisplayManagerTest : public test::AshTestBase, |
} |
// aura::DisplayObserver overrides: |
- virtual void OnDisplayMetricsChanged(const gfx::Display& display, |
- uint32_t) override { |
+ void OnDisplayMetricsChanged(const gfx::Display& display, uint32_t) override { |
changed_.push_back(display); |
} |
- virtual void OnDisplayAdded(const gfx::Display& new_display) override { |
+ void OnDisplayAdded(const gfx::Display& new_display) override { |
added_.push_back(new_display); |
} |
- virtual void OnDisplayRemoved(const gfx::Display& old_display) override { |
+ void OnDisplayRemoved(const gfx::Display& old_display) override { |
++removed_count_; |
} |
// aura::WindowObserver overrides: |
- virtual void OnWindowDestroying(aura::Window* window) override { |
+ void OnWindowDestroying(aura::Window* window) override { |
ASSERT_EQ(Shell::GetPrimaryRootWindow(), window); |
root_window_destroyed_ = true; |
} |
@@ -1182,17 +1181,17 @@ TEST_F(DisplayManagerTest, MAYBE_UpdateMouseCursorAfterRotateZoom) { |
class TestDisplayObserver : public gfx::DisplayObserver { |
public: |
TestDisplayObserver() : changed_(false) {} |
- virtual ~TestDisplayObserver() {} |
+ ~TestDisplayObserver() override {} |
// gfx::DisplayObserver overrides: |
- virtual void OnDisplayMetricsChanged(const gfx::Display&,uint32_t) override {} |
- virtual void OnDisplayAdded(const gfx::Display& new_display) override { |
+ void OnDisplayMetricsChanged(const gfx::Display&, uint32_t) override {} |
+ void OnDisplayAdded(const gfx::Display& new_display) override { |
// Mirror window should already be delete before restoring |
// the external display. |
EXPECT_FALSE(test_api.GetHost()); |
changed_ = true; |
} |
- virtual void OnDisplayRemoved(const gfx::Display& old_display) override { |
+ void OnDisplayRemoved(const gfx::Display& old_display) override { |
// Mirror window should not be created until the external display |
// is removed. |
EXPECT_FALSE(test_api.GetHost()); |
@@ -1417,9 +1416,9 @@ class ScreenShutdownTest : public test::AshTestBase { |
public: |
ScreenShutdownTest() { |
} |
- virtual ~ScreenShutdownTest() {} |
+ ~ScreenShutdownTest() override {} |
- virtual void TearDown() override { |
+ void TearDown() override { |
gfx::Screen* orig_screen = |
gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE); |
AshTestBase::TearDown(); |