| 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);
|
| + }
|
| }
|
| }
|
|
|
|
|