summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui_test_utils.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:36:09 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:36:09 +0000
commitb6d81261a469240e25b41e7125bb7166ca3d35bb (patch)
tree9ddaf52100915560ce5c3d0167e79ef4a26aec56 /chrome/test/ui_test_utils.h
parent917a44b0724089630cb1d962a9383df7a1deaf7e (diff)
downloadchromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.zip
chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.gz
chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.bz2
Move app/key* to ui/base/keycodes/*
BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6246001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.h')
-rw-r--r--chrome/test/ui_test_utils.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index a0deb1c..ad661e9 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -11,7 +11,6 @@
#include <string>
#include <set>
-#include "app/keyboard_codes.h"
#include "base/basictypes.h"
#include "base/message_loop.h"
#include "base/scoped_temp_dir.h"
@@ -24,6 +23,7 @@
#include "chrome/test/automation/dom_element_proxy.h"
#include "gfx/native_widget_types.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "webkit/glue/window_open_disposition.h"
class AppModalDialog;
@@ -257,7 +257,7 @@ Browser* GetBrowserNotInSet(std::set<Browser*> excluded_browsers);
// out. This uses ui_controls::SendKeyPress, see it for details. Returns true
// if the event was successfully sent and received.
bool SendKeyPressSync(const Browser* browser,
- app::KeyboardCode key,
+ ui::KeyboardCode key,
bool control,
bool shift,
bool alt,
@@ -268,7 +268,7 @@ bool SendKeyPressSync(const Browser* browser,
// ui_controls::SendKeyPress, see it for details. Returns true if the event was
// successfully sent and both the event and notification were received.
bool SendKeyPressAndWait(const Browser* browser,
- app::KeyboardCode key,
+ ui::KeyboardCode key,
bool control,
bool shift,
bool alt,
@@ -480,7 +480,7 @@ class WindowedNotificationObserverWithDetails
template <class U>
bool SendKeyPressAndWaitWithDetails(
const Browser* browser,
- app::KeyboardCode key,
+ ui::KeyboardCode key,
bool control,
bool shift,
bool alt,
@@ -492,7 +492,7 @@ bool SendKeyPressAndWaitWithDetails(
template <class U>
bool SendKeyPressAndWaitWithDetails(
const Browser* browser,
- app::KeyboardCode key,
+ ui::KeyboardCode key,
bool control,
bool shift,
bool alt,