summaryrefslogtreecommitdiffstats
path: root/chrome/test/render_view_test.cc
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:22:15 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:22:15 +0000
commit2b7c9492e9a8794e2124da62bfce91fe3a1b2a77 (patch)
treef13a5c7961e2655f63916216223d16fa86454a3d /chrome/test/render_view_test.cc
parent010e37516995713253daa8df6f7ba1c2b12ccd1d (diff)
downloadchromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.zip
chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.gz
chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.bz2
Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/render_view_test.cc')
-rw-r--r--chrome/test/render_view_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index 9094525..848f440 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -26,7 +26,7 @@
#include "webkit/glue/webkit_glue.h"
#if defined(OS_LINUX)
-#include "base/event_synthesis_gtk.h"
+#include "app/event_synthesis_gtk.h"
#endif
using WebKit::WebFrame;
@@ -188,8 +188,8 @@ int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,
// We ignore |layout|, which means we are only testing the layout of the
// current locale. TODO(estade): fix this to respect |layout|.
std::vector<GdkEvent*> events;
- base::SynthesizeKeyPressEvents(
- NULL, static_cast<base::KeyboardCode>(key_code),
+ app::SynthesizeKeyPressEvents(
+ NULL, static_cast<app::KeyboardCode>(key_code),
modifiers & (MockKeyboard::LEFT_CONTROL | MockKeyboard::RIGHT_CONTROL),
modifiers & (MockKeyboard::LEFT_SHIFT | MockKeyboard::RIGHT_SHIFT),
modifiers & (MockKeyboard::LEFT_ALT | MockKeyboard::RIGHT_ALT),