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

Unified Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 1308063007: Generate non-located windowsKeyCode for the WebInputEvents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase against dependent change Created 5 years, 3 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
Index: content/browser/renderer_host/web_input_event_aura.cc
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc
index bbad8c7729de5201641ca854491549d3ff0f6816..aed585ac9bd86198bf0abffcd4e3147be9e54298 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/content/browser/renderer_host/web_input_event_aura.cc
@@ -33,21 +33,6 @@ gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) {
return screen_location;
}
-blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(
- ui::DomCode code) {
- switch (ui::KeycodeConverter::DomCodeToLocation(code)) {
- case ui::DomKeyLocation::LEFT:
- return blink::WebInputEvent::IsLeft;
- case ui::DomKeyLocation::RIGHT:
- return blink::WebInputEvent::IsRight;
- case ui::DomKeyLocation::NUMPAD:
- return blink::WebInputEvent::IsKeyPad;
- case ui::DomKeyLocation::STANDARD:
- break;
- }
- return static_cast<blink::WebInputEvent::Modifiers>(0);
-}
-
} // namespace
#if defined(OS_WIN)
@@ -84,7 +69,7 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
webkit_event.isSystemKey = true;
- webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode();
+ webkit_event.windowsKeyCode = event.key_code();
webkit_event.nativeKeyCode =
ui::KeycodeConverter::DomCodeToNativeKeycode(event.code());
webkit_event.domCode = static_cast<int>(event.code());

Powered by Google App Engine
This is Rietveld 408576698