Index: ash/root_window_controller_unittest.cc |
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
index 339be89e4d83a90ba961bce267eca1d3d7368866..4d7a0862d8095d4b62d8339bff81ad4d46ea7f37 100644 |
--- a/ash/root_window_controller_unittest.cc |
+++ b/ash/root_window_controller_unittest.cc |
@@ -51,11 +51,11 @@ class TestDelegate : public views::WidgetDelegateView { |
virtual ~TestDelegate() {} |
// Overridden from views::WidgetDelegate: |
- virtual views::View* GetContentsView() OVERRIDE { |
+ virtual views::View* GetContentsView() override { |
return this; |
} |
- virtual ui::ModalType GetModalType() const OVERRIDE { |
+ virtual ui::ModalType GetModalType() const override { |
return system_modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE; |
} |
@@ -78,13 +78,13 @@ class DeleteOnBlurDelegate : public aura::test::TestWindowDelegate, |
private: |
// aura::test::TestWindowDelegate overrides: |
- virtual bool CanFocus() OVERRIDE { |
+ virtual bool CanFocus() override { |
return true; |
} |
// aura::client::FocusChangeObserver implementation: |
virtual void OnWindowFocused(aura::Window* gained_focus, |
- aura::Window* lost_focus) OVERRIDE { |
+ aura::Window* lost_focus) override { |
if (window_ == lost_focus) |
delete window_; |
} |
@@ -538,7 +538,7 @@ class DestroyedWindowObserver : public aura::WindowObserver { |
bool destroyed() const { return destroyed_; } |
// WindowObserver overrides: |
- virtual void OnWindowDestroying(Window* window) OVERRIDE { |
+ virtual void OnWindowDestroying(Window* window) override { |
destroyed_ = true; |
Shutdown(); |
} |
@@ -617,7 +617,7 @@ class VirtualKeyboardRootWindowControllerTest |
VirtualKeyboardRootWindowControllerTest() {}; |
virtual ~VirtualKeyboardRootWindowControllerTest() {}; |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
CommandLine::ForCurrentProcess()->AppendSwitch( |
keyboard::switches::kEnableVirtualKeyboard); |
test::AshTestBase::SetUp(); |
@@ -634,7 +634,7 @@ class MockTextInputClient : public ui::DummyTextInputClient { |
MockTextInputClient() : |
ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_TEXT) {} |
- virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE { |
+ virtual void EnsureCaretInRect(const gfx::Rect& rect) override { |
visible_rect_ = rect; |
} |
@@ -653,7 +653,7 @@ class TargetHitTestEventHandler : public ui::test::TestEventHandler { |
TargetHitTestEventHandler() {} |
// ui::test::TestEventHandler overrides. |
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { |
+ virtual void OnMouseEvent(ui::MouseEvent* event) override { |
if (event->type() == ui::ET_MOUSE_PRESSED) |
ui::test::TestEventHandler::OnMouseEvent(event); |
event->StopPropagation(); |