summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui_test_utils.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 19:09:06 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 19:09:06 +0000
commit92258389a1a4190987f3b4a64386fd9eb0f126ea (patch)
tree567ea0779660a7f822289f3c945721f2e9d6fad1 /chrome/test/ui_test_utils.h
parent47fa280c2ff011bb948a9978687418079731a854 (diff)
downloadchromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.zip
chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.gz
chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.h')
-rw-r--r--chrome/test/ui_test_utils.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index 28552d8..8ca8b02 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -10,8 +10,8 @@
#include <string>
#include <set>
-#include "app/keyboard_codes.h"
#include "base/basictypes.h"
+#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "base/scoped_temp_dir.h"
#include "base/string16.h"
@@ -193,7 +193,7 @@ void WaitForBookmarkModelToLoad(BookmarkModel* model);
// out. This uses ui_controls::SendKeyPress, see it for details. Returns true
// if the event was successfully sent and received.
bool SendKeyPressSync(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control,
bool shift,
bool alt,