summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/keyboard_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 14:38:40 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 14:38:40 +0000
commit35976fe0742b955ce427baeb2e5e313837b3d27d (patch)
treed31ad5128d824195a0193adc756aad39a00f2046 /webkit/tools/test_shell/keyboard_unittest.cc
parentea7d84fc40389fa60842d66e2eb39d9f23159bfa (diff)
downloadchromium_src-35976fe0742b955ce427baeb2e5e313837b3d27d.zip
chromium_src-35976fe0742b955ce427baeb2e5e313837b3d27d.tar.gz
chromium_src-35976fe0742b955ce427baeb2e5e313837b3d27d.tar.bz2
Fixing WebKeyboardEvent. For reals this time.
A recommit of http://codereview.chromium.org/27056 . Review URL: http://codereview.chromium.org/28136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/keyboard_unittest.cc')
-rw-r--r--webkit/tools/test_shell/keyboard_unittest.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc
index 673edd1..4943341 100644
--- a/webkit/tools/test_shell/keyboard_unittest.cc
+++ b/webkit/tools/test_shell/keyboard_unittest.cc
@@ -46,15 +46,10 @@ 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;
}
// Like InterpretKeyEvent, but with pressing down OSModifier+|key_code|.