diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 02:00:58 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 02:00:58 +0000 |
commit | be9826e6bcbc3ccd52816f4122fc885139867ef5 (patch) | |
tree | 0139107baeb407ec1f621f73d5affeff99b39133 /chrome/test/base/ui_controls_aurax11.cc | |
parent | 086e6660ce1a6d723ae0b926ca76e267d57d351e (diff) | |
download | chromium_src-be9826e6bcbc3ccd52816f4122fc885139867ef5.zip chromium_src-be9826e6bcbc3ccd52816f4122fc885139867ef5.tar.gz chromium_src-be9826e6bcbc3ccd52816f4122fc885139867ef5.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, chrome/ edition part 1.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files.
BUG=115047
TBR=sky
Review URL: https://codereview.chromium.org/12226045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_controls_aurax11.cc')
-rw-r--r-- | chrome/test/base/ui_controls_aurax11.cc | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/chrome/test/base/ui_controls_aurax11.cc b/chrome/test/base/ui_controls_aurax11.cc index 1f2b52a..c643650 100644 --- a/chrome/test/base/ui_controls_aurax11.cc +++ b/chrome/test/base/ui_controls_aurax11.cc @@ -87,18 +87,19 @@ class UIControlsX11 : public UIControlsAura { bool control, bool shift, bool alt, - bool command) { + bool command) OVERRIDE { DCHECK(!command); // No command key on Aura return SendKeyPressNotifyWhenDone( window, key, control, shift, alt, command, base::Closure()); } - virtual bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, - ui::KeyboardCode key, - bool control, - bool shift, - bool alt, - bool command, - const base::Closure& closure) { + virtual bool SendKeyPressNotifyWhenDone( + gfx::NativeWindow window, + ui::KeyboardCode key, + bool control, + bool shift, + bool alt, + bool command, + const base::Closure& closure) OVERRIDE { DCHECK(!command); // No command key on Aura XEvent xevent = {0}; xevent.xkey.type = KeyPress; @@ -128,12 +129,13 @@ class UIControlsX11 : public UIControlsAura { } // Simulate a mouse move. (x,y) are absolute screen coordinates. - virtual bool SendMouseMove(long x, long y) { + virtual bool SendMouseMove(long x, long y) OVERRIDE { return SendMouseMoveNotifyWhenDone(x, y, base::Closure()); } - virtual bool SendMouseMoveNotifyWhenDone(long x, - long y, - const base::Closure& closure) { + virtual bool SendMouseMoveNotifyWhenDone( + long x, + long y, + const base::Closure& closure) OVERRIDE { XEvent xevent = {0}; XMotionEvent* xmotion = &xevent.xmotion; xmotion->type = MotionNotify; @@ -149,12 +151,13 @@ class UIControlsX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseEvents(MouseButton type, int state) { + 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) { + virtual bool SendMouseEventsNotifyWhenDone( + MouseButton type, + int state, + const base::Closure& closure) OVERRIDE { XEvent xevent = {0}; XButtonEvent* xbutton = &xevent.xbutton; DCHECK_NE(g_current_x, -1000); @@ -190,10 +193,11 @@ class UIControlsX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseClick(MouseButton type) { + virtual bool SendMouseClick(MouseButton type) OVERRIDE { return SendMouseEvents(type, UP | DOWN); } - virtual void RunClosureAfterAllPendingUIEvents(const base::Closure& closure) { + virtual void RunClosureAfterAllPendingUIEvents( + const base::Closure& closure) OVERRIDE { if (closure.is_null()) return; static XEvent* marker_event = NULL; |