Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 954943003: [KeyboardEvent] Use DOM |code| rather than Windows-based key code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing VKEY in windows for brightness and power Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/base/accelerators/accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 392256809f2036d16062ec5731d8ef227cd521bb..be140085190d02eed90589010b786965dd43cc28 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -220,8 +220,7 @@ class RenderViewImplTest : public RenderViewTest {
static_cast<ui::KeyboardCode>(key_code),
flags);
ui::KeyEvent event2(xevent);
- event2.set_character(GetCharacterFromKeyCode(event2.key_code(),
- event2.flags()));
+ event2.set_character(DomCodeToCharacter(event2.code(), event2.flags()));
ui::KeyEventTestApi test_event2(&event2);
test_event2.set_is_char(true);
NativeWebKeyboardEvent char_event(event2);
@@ -234,8 +233,9 @@ class RenderViewImplTest : public RenderViewTest {
NativeWebKeyboardEvent keyup_event(event3);
SendNativeKeyEvent(keyup_event);
- long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
- flags);
+ ui::KeyboardCode keycode = static_cast<ui::KeyboardCode>(key_code);
+ ui::DomCode code = KeyboardCodeToDomCode(keycode);
+ long c = DomCodeToCharacter(code, flags);
output->assign(1, static_cast<base::char16>(c));
return 1;
#elif defined(USE_OZONE)
@@ -259,8 +259,9 @@ class RenderViewImplTest : public RenderViewTest {
NativeWebKeyboardEvent keyup_web_event(keyup_event);
SendNativeKeyEvent(keyup_web_event);
- long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
- flags);
+ ui::KeyboardCode keycode = static_cast<ui::KeyboardCode>(key_code);
+ ui::DomCode code = KeyboardCodeToDomCode(keycode);
+ long c = DomCodeToCharacter(code, flags);
output->assign(1, static_cast<base::char16>(c));
return 1;
#else
« no previous file with comments | « no previous file | ui/base/accelerators/accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698