diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/DEPS | 1 | ||||
| -rw-r--r-- | webkit/support/webkit_support.h | 28 | ||||
| -rw-r--r-- | webkit/tools/test_shell/event_sending_controller.cc | 36 |
3 files changed, 33 insertions, 32 deletions
diff --git a/webkit/support/DEPS b/webkit/support/DEPS index e27e2eb..b42ea7d 100644 --- a/webkit/support/DEPS +++ b/webkit/support/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+app", "+media" ] diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index 0cb00b8..6c17de2 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -7,8 +7,8 @@ #include <string> +#include "app/keyboard_codes.h" #include "base/basictypes.h" -#include "base/keyboard_codes.h" #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" class Task; @@ -155,19 +155,19 @@ WebKit::WebURL GetDevToolsPathAsURL(); // -------- Keyboard code enum { - VKEY_LEFT = base::VKEY_LEFT, - VKEY_RIGHT = base::VKEY_RIGHT, - VKEY_UP = base::VKEY_UP, - VKEY_DOWN = base::VKEY_DOWN, - VKEY_RETURN = base::VKEY_RETURN, - VKEY_INSERT = base::VKEY_INSERT, - VKEY_DELETE = base::VKEY_DELETE, - VKEY_PRIOR = base::VKEY_PRIOR, - VKEY_NEXT = base::VKEY_NEXT, - VKEY_HOME = base::VKEY_HOME, - VKEY_END = base::VKEY_END, - VKEY_SNAPSHOT = base::VKEY_SNAPSHOT, - VKEY_F1 = base::VKEY_F1, + VKEY_LEFT = app::VKEY_LEFT, + VKEY_RIGHT = app::VKEY_RIGHT, + VKEY_UP = app::VKEY_UP, + VKEY_DOWN = app::VKEY_DOWN, + VKEY_RETURN = app::VKEY_RETURN, + VKEY_INSERT = app::VKEY_INSERT, + VKEY_DELETE = app::VKEY_DELETE, + VKEY_PRIOR = app::VKEY_PRIOR, + VKEY_NEXT = app::VKEY_NEXT, + VKEY_HOME = app::VKEY_HOME, + VKEY_END = app::VKEY_END, + VKEY_SNAPSHOT = app::VKEY_SNAPSHOT, + VKEY_F1 = app::VKEY_F1, }; } // namespace webkit_support diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index 62cf0a4..6a8f5e3 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -19,10 +19,10 @@ #include <queue> #include <vector> +#include "app/keyboard_codes.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/time.h" @@ -217,16 +217,16 @@ bool GetEditCommand(const WebKeyboardEvent& event, std::string* name) { return false; switch (event.windowsKeyCode) { - case base::VKEY_LEFT: + case app::VKEY_LEFT: *name = "MoveToBeginningOfLine"; break; - case base::VKEY_RIGHT: + case app::VKEY_RIGHT: *name = "MoveToEndOfLine"; break; - case base::VKEY_UP: + case app::VKEY_UP: *name = "MoveToBeginningOfDocument"; break; - case base::VKEY_DOWN: + case app::VKEY_DOWN: *name = "MoveToEndOfDocument"; break; default: @@ -537,29 +537,29 @@ void EventSendingController::keyDown( bool needs_shift_key_modifier = false; if (L"\n" == code_str) { generate_char = true; - text = code = base::VKEY_RETURN; + text = code = app::VKEY_RETURN; } else if (L"rightArrow" == code_str) { - code = base::VKEY_RIGHT; + code = app::VKEY_RIGHT; } else if (L"downArrow" == code_str) { - code = base::VKEY_DOWN; + code = app::VKEY_DOWN; } else if (L"leftArrow" == code_str) { - code = base::VKEY_LEFT; + code = app::VKEY_LEFT; } else if (L"upArrow" == code_str) { - code = base::VKEY_UP; + code = app::VKEY_UP; } else if (L"insert" == code_str) { - code = base::VKEY_INSERT; + code = app::VKEY_INSERT; } else if (L"delete" == code_str) { - code = base::VKEY_BACK; + code = app::VKEY_BACK; } else if (L"pageUp" == code_str) { - code = base::VKEY_PRIOR; + code = app::VKEY_PRIOR; } else if (L"pageDown" == code_str) { - code = base::VKEY_NEXT; + code = app::VKEY_NEXT; } else if (L"home" == code_str) { - code = base::VKEY_HOME; + code = app::VKEY_HOME; } else if (L"end" == code_str) { - code = base::VKEY_END; + code = app::VKEY_END; } else if (L"printScreen" == code_str) { - code = base::VKEY_SNAPSHOT; + code = app::VKEY_SNAPSHOT; } else { // Compare the input string with the function-key names defined by the // DOM spec (i.e. "F1",...,"F24"). If the input string is a function-key @@ -569,7 +569,7 @@ void EventSendingController::keyDown( function_key_name += L"F"; function_key_name += UTF8ToWide(base::IntToString(i)); if (function_key_name == code_str) { - code = base::VKEY_F1 + (i - 1); + code = app::VKEY_F1 + (i - 1); break; } } |