diff options
Diffstat (limited to 'chrome/test/webdriver')
-rw-r--r-- | chrome/test/webdriver/keymap.cc | 184 | ||||
-rw-r--r-- | chrome/test/webdriver/keymap.h | 10 |
2 files changed, 97 insertions, 97 deletions
diff --git a/chrome/test/webdriver/keymap.cc b/chrome/test/webdriver/keymap.cc index 1ab0a31..bb08457 100644 --- a/chrome/test/webdriver/keymap.cc +++ b/chrome/test/webdriver/keymap.cc @@ -14,132 +14,132 @@ KeyMap::KeyMap() { // 0xE000-0xF8FF. // Special WebDriver NULL key; clears all modifiers. - keys_[L'\uE000'] = app::VKEY_UNKNOWN; - - keys_[L'\uE001'] = app::VKEY_UNKNOWN; // TODO(jmikhail): CANCEL - keys_[L'\uE002'] = app::VKEY_HELP; - keys_[L'\uE003'] = app::VKEY_BACK; // BACKSPACE - keys_[L'\uE004'] = app::VKEY_TAB; - keys_[L'\uE005'] = app::VKEY_CLEAR; - keys_[L'\uE006'] = app::VKEY_RETURN; - keys_[L'\uE007'] = app::VKEY_UNKNOWN; // TODO(jmikhail): ENTER - keys_[L'\uE008'] = app::VKEY_SHIFT; - keys_[L'\uE009'] = app::VKEY_CONTROL; - keys_[L'\uE00A'] = app::VKEY_MENU; // ALT - keys_[L'\uE00B'] = app::VKEY_PAUSE; - keys_[L'\uE00C'] = app::VKEY_ESCAPE; - keys_[L'\uE00D'] = app::VKEY_SPACE; - keys_[L'\uE00E'] = app::VKEY_PRIOR; // PAGEUP - keys_[L'\uE00F'] = app::VKEY_NEXT; // PAGEDOWN - keys_[L'\uE010'] = app::VKEY_END; - keys_[L'\uE011'] = app::VKEY_HOME; - keys_[L'\uE012'] = app::VKEY_LEFT; - keys_[L'\uE013'] = app::VKEY_UP; - keys_[L'\uE014'] = app::VKEY_RIGHT; - keys_[L'\uE015'] = app::VKEY_DOWN; - keys_[L'\uE016'] = app::VKEY_INSERT; - keys_[L'\uE017'] = app::VKEY_DELETE; - - keys_[L'\uE01A'] = app::VKEY_NUMPAD0; - keys_[L'\uE01B'] = app::VKEY_NUMPAD1; - keys_[L'\uE01C'] = app::VKEY_NUMPAD2; - keys_[L'\uE01D'] = app::VKEY_NUMPAD3; - keys_[L'\uE01E'] = app::VKEY_NUMPAD4; - keys_[L'\uE01F'] = app::VKEY_NUMPAD5; - keys_[L'\uE020'] = app::VKEY_NUMPAD6; - keys_[L'\uE021'] = app::VKEY_NUMPAD7; - keys_[L'\uE022'] = app::VKEY_NUMPAD8; - keys_[L'\uE023'] = app::VKEY_NUMPAD9; - keys_[L'\uE024'] = app::VKEY_MULTIPLY; - keys_[L'\uE025'] = app::VKEY_ADD; - keys_[L'\uE026'] = app::VKEY_SEPARATOR; - keys_[L'\uE027'] = app::VKEY_SUBTRACT; - keys_[L'\uE028'] = app::VKEY_DECIMAL; - keys_[L'\uE029'] = app::VKEY_DIVIDE; - - keys_[L'\uE031'] = app::VKEY_F1; - keys_[L'\uE032'] = app::VKEY_F2; - keys_[L'\uE033'] = app::VKEY_F3; - keys_[L'\uE034'] = app::VKEY_F4; - keys_[L'\uE035'] = app::VKEY_F5; - keys_[L'\uE036'] = app::VKEY_F6; - keys_[L'\uE037'] = app::VKEY_F7; - keys_[L'\uE038'] = app::VKEY_F8; - keys_[L'\uE039'] = app::VKEY_F9; - keys_[L'\uE03A'] = app::VKEY_F10; - keys_[L'\uE03B'] = app::VKEY_F11; - keys_[L'\uE03C'] = app::VKEY_F12; + keys_[L'\uE000'] = ui::VKEY_UNKNOWN; + + keys_[L'\uE001'] = ui::VKEY_UNKNOWN; // TODO(jmikhail): CANCEL + keys_[L'\uE002'] = ui::VKEY_HELP; + keys_[L'\uE003'] = ui::VKEY_BACK; // BACKSPACE + keys_[L'\uE004'] = ui::VKEY_TAB; + keys_[L'\uE005'] = ui::VKEY_CLEAR; + keys_[L'\uE006'] = ui::VKEY_RETURN; + keys_[L'\uE007'] = ui::VKEY_UNKNOWN; // TODO(jmikhail): ENTER + keys_[L'\uE008'] = ui::VKEY_SHIFT; + keys_[L'\uE009'] = ui::VKEY_CONTROL; + keys_[L'\uE00A'] = ui::VKEY_MENU; // ALT + keys_[L'\uE00B'] = ui::VKEY_PAUSE; + keys_[L'\uE00C'] = ui::VKEY_ESCAPE; + keys_[L'\uE00D'] = ui::VKEY_SPACE; + keys_[L'\uE00E'] = ui::VKEY_PRIOR; // PAGEUP + keys_[L'\uE00F'] = ui::VKEY_NEXT; // PAGEDOWN + keys_[L'\uE010'] = ui::VKEY_END; + keys_[L'\uE011'] = ui::VKEY_HOME; + keys_[L'\uE012'] = ui::VKEY_LEFT; + keys_[L'\uE013'] = ui::VKEY_UP; + keys_[L'\uE014'] = ui::VKEY_RIGHT; + keys_[L'\uE015'] = ui::VKEY_DOWN; + keys_[L'\uE016'] = ui::VKEY_INSERT; + keys_[L'\uE017'] = ui::VKEY_DELETE; + + keys_[L'\uE01A'] = ui::VKEY_NUMPAD0; + keys_[L'\uE01B'] = ui::VKEY_NUMPAD1; + keys_[L'\uE01C'] = ui::VKEY_NUMPAD2; + keys_[L'\uE01D'] = ui::VKEY_NUMPAD3; + keys_[L'\uE01E'] = ui::VKEY_NUMPAD4; + keys_[L'\uE01F'] = ui::VKEY_NUMPAD5; + keys_[L'\uE020'] = ui::VKEY_NUMPAD6; + keys_[L'\uE021'] = ui::VKEY_NUMPAD7; + keys_[L'\uE022'] = ui::VKEY_NUMPAD8; + keys_[L'\uE023'] = ui::VKEY_NUMPAD9; + keys_[L'\uE024'] = ui::VKEY_MULTIPLY; + keys_[L'\uE025'] = ui::VKEY_ADD; + keys_[L'\uE026'] = ui::VKEY_SEPARATOR; + keys_[L'\uE027'] = ui::VKEY_SUBTRACT; + keys_[L'\uE028'] = ui::VKEY_DECIMAL; + keys_[L'\uE029'] = ui::VKEY_DIVIDE; + + keys_[L'\uE031'] = ui::VKEY_F1; + keys_[L'\uE032'] = ui::VKEY_F2; + keys_[L'\uE033'] = ui::VKEY_F3; + keys_[L'\uE034'] = ui::VKEY_F4; + keys_[L'\uE035'] = ui::VKEY_F5; + keys_[L'\uE036'] = ui::VKEY_F6; + keys_[L'\uE037'] = ui::VKEY_F7; + keys_[L'\uE038'] = ui::VKEY_F8; + keys_[L'\uE039'] = ui::VKEY_F9; + keys_[L'\uE03A'] = ui::VKEY_F10; + keys_[L'\uE03B'] = ui::VKEY_F11; + keys_[L'\uE03C'] = ui::VKEY_F12; // Common aliases. - keys_[L'\t'] = app::VKEY_TAB; - keys_[L'\n'] = app::VKEY_RETURN; - keys_[L'\r'] = app::VKEY_RETURN; - keys_[L'\b'] = app::VKEY_BACK; + keys_[L'\t'] = ui::VKEY_TAB; + keys_[L'\n'] = ui::VKEY_RETURN; + keys_[L'\r'] = ui::VKEY_RETURN; + keys_[L'\b'] = ui::VKEY_BACK; - keys_[L' '] = app::VKEY_SPACE; + keys_[L' '] = ui::VKEY_SPACE; // Alpha keys match their ASCII values. for (int i = 0; i < 26; ++i) { keys_[static_cast<wchar_t>(L'a' + i)] = \ - static_cast<app::KeyboardCode>(app::VKEY_A + i); + static_cast<ui::KeyboardCode>(ui::VKEY_A + i); shifted_keys_[static_cast<wchar_t>(L'A' + i)] = \ - static_cast<app::KeyboardCode>(app::VKEY_A + i); + static_cast<ui::KeyboardCode>(ui::VKEY_A + i); } // Numeric keys match their ASCII values. for (int i = 0; i < 10; ++i) { keys_[static_cast<wchar_t>(L'0' + i)] = \ - static_cast<app::KeyboardCode>(app::VKEY_0 + i); + static_cast<ui::KeyboardCode>(ui::VKEY_0 + i); } // The following all assumes the standard US keyboard. // TODO(jmikhail): Lookup correct keycode based on the current system keyboard // layout. Right now it's fixed assuming standard ANSI. - keys_[L'='] = shifted_keys_[L'+'] = app::VKEY_OEM_PLUS; - keys_[L'-'] = shifted_keys_[L'_'] = app::VKEY_OEM_MINUS; - keys_[L';'] = shifted_keys_[L':'] = app::VKEY_OEM_1; - keys_[L'/'] = shifted_keys_[L'?'] = app::VKEY_OEM_2; - keys_[L'`'] = shifted_keys_[L'~'] = app::VKEY_OEM_3; - keys_[L'['] = shifted_keys_[L'{'] = app::VKEY_OEM_4; - keys_[L'\\'] = shifted_keys_[L'|'] = app::VKEY_OEM_5; - keys_[L']'] = shifted_keys_[L'}'] = app::VKEY_OEM_6; - keys_[L'\''] = shifted_keys_[L'"'] = app::VKEY_OEM_7; - keys_[L','] = shifted_keys_[L'<'] = app::VKEY_OEM_COMMA; - keys_[L'.'] = shifted_keys_[L'>'] = app::VKEY_OEM_PERIOD; - shifted_keys_[L'!'] = app::VKEY_1; - shifted_keys_[L'@'] = app::VKEY_2; - shifted_keys_[L'#'] = app::VKEY_3; - shifted_keys_[L'$'] = app::VKEY_4; - shifted_keys_[L'%'] = app::VKEY_5; - shifted_keys_[L'^'] = app::VKEY_6; - shifted_keys_[L'&'] = app::VKEY_7; - shifted_keys_[L'*'] = app::VKEY_8; - shifted_keys_[L'('] = app::VKEY_9; - shifted_keys_[L')'] = app::VKEY_0; + keys_[L'='] = shifted_keys_[L'+'] = ui::VKEY_OEM_PLUS; + keys_[L'-'] = shifted_keys_[L'_'] = ui::VKEY_OEM_MINUS; + keys_[L';'] = shifted_keys_[L':'] = ui::VKEY_OEM_1; + keys_[L'/'] = shifted_keys_[L'?'] = ui::VKEY_OEM_2; + keys_[L'`'] = shifted_keys_[L'~'] = ui::VKEY_OEM_3; + keys_[L'['] = shifted_keys_[L'{'] = ui::VKEY_OEM_4; + keys_[L'\\'] = shifted_keys_[L'|'] = ui::VKEY_OEM_5; + keys_[L']'] = shifted_keys_[L'}'] = ui::VKEY_OEM_6; + keys_[L'\''] = shifted_keys_[L'"'] = ui::VKEY_OEM_7; + keys_[L','] = shifted_keys_[L'<'] = ui::VKEY_OEM_COMMA; + keys_[L'.'] = shifted_keys_[L'>'] = ui::VKEY_OEM_PERIOD; + shifted_keys_[L'!'] = ui::VKEY_1; + shifted_keys_[L'@'] = ui::VKEY_2; + shifted_keys_[L'#'] = ui::VKEY_3; + shifted_keys_[L'$'] = ui::VKEY_4; + shifted_keys_[L'%'] = ui::VKEY_5; + shifted_keys_[L'^'] = ui::VKEY_6; + shifted_keys_[L'&'] = ui::VKEY_7; + shifted_keys_[L'*'] = ui::VKEY_8; + shifted_keys_[L'('] = ui::VKEY_9; + shifted_keys_[L')'] = ui::VKEY_0; } -app::KeyboardCode KeyMap::Get(const wchar_t& key) const { - std::map<wchar_t, app::KeyboardCode>::const_iterator it; +ui::KeyboardCode KeyMap::Get(const wchar_t& key) const { + std::map<wchar_t, ui::KeyboardCode>::const_iterator it; it = keys_.find(key); if (it == keys_.end()) { it = shifted_keys_.find(key); if (it == shifted_keys_.end()) { - return app::VKEY_UNKNOWN; + return ui::VKEY_UNKNOWN; } } return it->second; } bool KeyMap::Press(const scoped_refptr<WindowProxy>& window, - const app::KeyboardCode key_code, + const ui::KeyboardCode key_code, const wchar_t& key) { - if (key_code == app::VKEY_SHIFT) { + if (key_code == ui::VKEY_SHIFT) { shift_ = !shift_; - } else if (key_code == app::VKEY_CONTROL) { + } else if (key_code == ui::VKEY_CONTROL) { control_ = !control_; - } else if (key_code == app::VKEY_MENU) { // ALT + } else if (key_code == ui::VKEY_MENU) { // ALT alt_ = !alt_; - } else if (key_code == app::VKEY_COMMAND) { + } else if (key_code == ui::VKEY_COMMAND) { command_ = !command_; } diff --git a/chrome/test/webdriver/keymap.h b/chrome/test/webdriver/keymap.h index b0abf46..fab2bcc 100644 --- a/chrome/test/webdriver/keymap.h +++ b/chrome/test/webdriver/keymap.h @@ -7,8 +7,8 @@ #include <map> -#include "app/keyboard_codes.h" #include "chrome/test/automation/window_proxy.h" +#include "ui/base/keycodes/keyboard_codes.h" namespace webdriver { @@ -16,10 +16,10 @@ namespace webdriver { class KeyMap { public: KeyMap(); - app::KeyboardCode Get(const wchar_t& key) const; + ui::KeyboardCode Get(const wchar_t& key) const; bool Press(const scoped_refptr<WindowProxy>& window, - const app::KeyboardCode key_code, + const ui::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, ui::KeyboardCode> keys_; + std::map<wchar_t, ui::KeyboardCode> shifted_keys_; DISALLOW_COPY_AND_ASSIGN(KeyMap); }; |