diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-26 15:36:37 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-26 15:36:37 +0000 |
| commit | 6d850f189679e9e60e8ef3135c037915f10cd6a9 (patch) | |
| tree | 3b0c8ba2c5672c15880ff774b6d368877e4d8b3f /webkit/tools/test_shell/keyboard_unittest.cc | |
| parent | b8e1f95cf888bba24fe3ef1d357474f23091235d (diff) | |
| download | chromium_src-6d850f189679e9e60e8ef3135c037915f10cd6a9.zip chromium_src-6d850f189679e9e60e8ef3135c037915f10cd6a9.tar.gz chromium_src-6d850f189679e9e60e8ef3135c037915f10cd6a9.tar.bz2 | |
Reverting key change (again); this breaks every keyboard layout test there is. Will fix and recommit.
Review URL: http://codereview.chromium.org/28186
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10469 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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc index 4943341..673edd1 100644 --- a/webkit/tools/test_shell/keyboard_unittest.cc +++ b/webkit/tools/test_shell/keyboard_unittest.cc @@ -46,10 +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; +#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|. |