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

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

Issue 1221083008: [NOT FOR COMMIT] Ignore inserting characters of Keys with modifiers on CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the double keydowns. 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
« no previous file with comments | « no previous file | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index d4a413aa2f42949746fa129b42de4b814233f4cd..babb56ef51ccc58fee547ee8eeb9fb1a0aa44253 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1612,12 +1612,25 @@ void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
if (host_ && (accept_return_character_ || ch != ui::VKEY_RETURN)) {
double now = ui::EventTimeForNow().InSecondsF();
// Send a blink::WebInputEvent::Char event to |host_|.
- NativeWebKeyboardEvent webkit_event(ui::ET_KEY_PRESSED,
- true /* is_char */,
- ch,
- flags,
- now);
- ForwardKeyboardEvent(webkit_event);
+ // On ChromeOS we send a blink::WebInputEvent::Char event only if no
+ // modifiers are currently pressed. Otherwise |is_char| will be false and we
+ // will end up sending a blink::WebInputEvent::RawKeyDown event.
+#if defined(OS_CHROMEOS)
+ const int kControlModifierMask = ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
+ ui::EF_COMMAND_DOWN;
+#else
+ const int kControlModifierMask = ui::EF_NONE;
+#endif // defined(OS_CHROMEOS)
+ const bool is_char = (flags & kControlModifierMask) == 0;
+
+ if (is_char) {
+ NativeWebKeyboardEvent webkit_event(ui::ET_KEY_PRESSED,
+ is_char,
+ ch,
+ flags,
+ now);
+ ForwardKeyboardEvent(webkit_event);
+ }
}
}
« no previous file with comments | « no previous file | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698