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

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

Issue 8380033: aura: Fix shift/ctrl/alt keyevents with RWHVA and X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 2 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_aurax11.cc
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index 44879fdca6f88d1b9b2d6a0531743352d4b851ec..d9e000a43760eadeff6b24a643a11041bdc2016d 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -289,12 +289,10 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event);
webkit_event.nativeKeyCode = native_key_event->keycode;
- if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) {
+ if (webkit_event.windowsKeyCode == ui::VKEY_RETURN)
webkit_event.unmodifiedText[0] = '\r';
- } else {
- webkit_event.unmodifiedText[0] =
- ui::DefaultXKeysymFromHardwareKeycode(native_key_event->keycode);
- }
+ else
+ webkit_event.unmodifiedText[0] = ui::DefaultSymbolFromXEvent(native_event);
if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) {
webkit_event.text[0] =
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | ui/base/keycodes/keyboard_code_conversion_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698