summaryrefslogtreecommitdiffstats
path: root/chrome/test/webdriver/keymap.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
commit0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch)
tree6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /chrome/test/webdriver/keymap.h
parent3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff)
downloadchromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2
Revert 58388 - 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 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/webdriver/keymap.h')
-rw-r--r--chrome/test/webdriver/keymap.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/webdriver/keymap.h b/chrome/test/webdriver/keymap.h
index e4b1594..688ffa7 100644
--- a/chrome/test/webdriver/keymap.h
+++ b/chrome/test/webdriver/keymap.h
@@ -7,7 +7,7 @@
#include <map>
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
#include "chrome/test/automation/window_proxy.h"
namespace webdriver {
@@ -16,10 +16,10 @@ namespace webdriver {
class KeyMap {
public:
KeyMap();
- app::KeyboardCode Get(const wchar_t& key) const;
+ base::KeyboardCode Get(const wchar_t& key) const;
bool Press(const scoped_refptr<WindowProxy>& window,
- const app::KeyboardCode key_code,
+ const base::KeyboardCode key_code,
const wchar_t& key);
// Sets the Shift, Alt, Cntl, and Cmd keys to not pressed
@@ -30,8 +30,8 @@ class KeyMap {
bool alt_;
bool control_;
bool command_;
- std::map<wchar_t, app::KeyboardCode> keys_;
- std::map<wchar_t, app::KeyboardCode> shifted_keys_;
+ std::map<wchar_t, base::KeyboardCode> keys_;
+ std::map<wchar_t, base::KeyboardCode> shifted_keys_;
DISALLOW_COPY_AND_ASSIGN(KeyMap);
};
} // namespace webdriver