Index: ui/aura/test/ui_controls_factory_aurax11.cc |
diff --git a/ui/aura/test/ui_controls_factory_aurax11.cc b/ui/aura/test/ui_controls_factory_aurax11.cc |
index 59db324ac02b08f5b59123bed4f6e27c9548e97d..8f6b278b572809d93f54f0eed73db2941eefb0e4 100644 |
--- a/ui/aura/test/ui_controls_factory_aurax11.cc |
+++ b/ui/aura/test/ui_controls_factory_aurax11.cc |
@@ -55,7 +55,7 @@ class UIControlsX11 : public UIControlsAura { |
bool control, |
bool shift, |
bool alt, |
- bool command) OVERRIDE { |
+ bool command) override { |
return SendKeyPressNotifyWhenDone( |
window, key, control, shift, alt, command, base::Closure()); |
} |
@@ -66,7 +66,7 @@ class UIControlsX11 : public UIControlsAura { |
bool shift, |
bool alt, |
bool command, |
- const base::Closure& closure) OVERRIDE { |
+ const base::Closure& closure) override { |
XEvent xevent = {0}; |
xevent.xkey.type = KeyPress; |
if (control) |
@@ -98,13 +98,13 @@ class UIControlsX11 : public UIControlsAura { |
return true; |
} |
- virtual bool SendMouseMove(long screen_x, long screen_y) OVERRIDE { |
+ virtual bool SendMouseMove(long screen_x, long screen_y) override { |
return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); |
} |
virtual bool SendMouseMoveNotifyWhenDone( |
long screen_x, |
long screen_y, |
- const base::Closure& closure) OVERRIDE { |
+ const base::Closure& closure) override { |
gfx::Point root_location(screen_x, screen_y); |
aura::client::ScreenPositionClient* screen_position_client = |
aura::client::GetScreenPositionClient(host_->window()); |
@@ -134,13 +134,13 @@ class UIControlsX11 : public UIControlsAura { |
RunClosureAfterAllPendingUIEvents(closure); |
return true; |
} |
- virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE { |
+ virtual bool SendMouseEvents(MouseButton type, int state) override { |
return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); |
} |
virtual bool SendMouseEventsNotifyWhenDone( |
MouseButton type, |
int state, |
- const base::Closure& closure) OVERRIDE { |
+ const base::Closure& closure) override { |
XEvent xevent = {0}; |
XButtonEvent* xbutton = &xevent.xbutton; |
gfx::Point mouse_loc = aura::Env::GetInstance()->last_mouse_location(); |
@@ -181,11 +181,11 @@ class UIControlsX11 : public UIControlsAura { |
RunClosureAfterAllPendingUIEvents(closure); |
return true; |
} |
- virtual bool SendMouseClick(MouseButton type) OVERRIDE { |
+ virtual bool SendMouseClick(MouseButton type) override { |
return SendMouseEvents(type, UP | DOWN); |
} |
virtual void RunClosureAfterAllPendingUIEvents( |
- const base::Closure& closure) OVERRIDE { |
+ const base::Closure& closure) override { |
if (closure.is_null()) |
return; |
static XEvent* marker_event = NULL; |