diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 18:27:44 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 18:27:44 +0000 |
| commit | 9958c8ab6f76da35fbf30272b2b82d26bf823230 (patch) | |
| tree | cab2771b559c9c791e0e4afd0d55fbe218b58e38 /webkit/tools/test_shell/keyboard_unittest.cc | |
| parent | df064db3c7284f8b3b7330dd332584e0aa462483 (diff) | |
| download | chromium_src-9958c8ab6f76da35fbf30272b2b82d26bf823230.zip chromium_src-9958c8ab6f76da35fbf30272b2b82d26bf823230.tar.gz chromium_src-9958c8ab6f76da35fbf30272b2b82d26bf823230.tar.bz2 | |
Reverting 10794.
Review URL: http://codereview.chromium.org/40027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/keyboard_unittest.cc')
| -rw-r--r-- | webkit/tools/test_shell/keyboard_unittest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc index 03f1b15..673edd1 100644 --- a/webkit/tools/test_shell/keyboard_unittest.cc +++ b/webkit/tools/test_shell/keyboard_unittest.cc @@ -14,11 +14,9 @@ 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; @@ -48,14 +46,15 @@ class KeyboardTest : public testing::Test { void SetupKeyDownEvent(WebKeyboardEvent* keyboard_event, char key_code, int modifiers) { - keyboard_event->windows_key_code = key_code; + keyboard_event->key_code = key_code; keyboard_event->modifiers = modifiers; keyboard_event->type = WebInputEvent::KEY_DOWN; - 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); +#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 } // Like InterpretKeyEvent, but with pressing down OSModifier+|key_code|. |