diff options
Diffstat (limited to 'webkit/tools/test_shell/keyboard_unittest.cc')
| -rw-r--r-- | webkit/tools/test_shell/keyboard_unittest.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc index 673edd1..03f1b15 100644 --- a/webkit/tools/test_shell/keyboard_unittest.cc +++ b/webkit/tools/test_shell/keyboard_unittest.cc @@ -14,9 +14,11 @@ MSVC_POP_WARNING(); #undef LOG +#include "base/string_util.h" #include "webkit/glue/editor_client_impl.h" #include "webkit/glue/event_conversion.h" #include "webkit/glue/webinputevent.h" +#include "webkit/glue/webinputevent_util.h" #include "testing/gtest/include/gtest/gtest.h" using WebCore::PlatformKeyboardEvent; @@ -46,15 +48,14 @@ class KeyboardTest : public testing::Test { void SetupKeyDownEvent(WebKeyboardEvent* keyboard_event, char key_code, int modifiers) { - keyboard_event->key_code = key_code; + keyboard_event->windows_key_code = key_code; keyboard_event->modifiers = modifiers; keyboard_event->type = WebInputEvent::KEY_DOWN; -#if defined(OS_LINUX) - keyboard_event->text = key_code; -#elif defined(OS_MACOSX) - keyboard_event->text.clear(); - keyboard_event->text.push_back(key_code); -#endif + keyboard_event->text[0] = key_code; + std::string key_identifier_str = + webkit_glue::GetKeyIdentifierForWindowsKeyCode(key_code); + base::strlcpy(keyboard_event->key_identifier, key_identifier_str.c_str(), + kIdentifierLengthCap); } // Like InterpretKeyEvent, but with pressing down OSModifier+|key_code|. |