[NOT FOR COMMIT] Ignore inserting characters of Keys with modifiers on CrOS

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <set>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 1594 matching lines @@
 void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
   if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) {
     popup_child_host_view_->InsertChar(ch, flags);
     return;
   }
 
   // Ignore character messages for VKEY_RETURN sent on CTRL+M. crbug.com/315547
   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);
+    }
   }
 }
 
 ui::TextInputType RenderWidgetHostViewAura::GetTextInputType() const {
   return text_input_type_;
 }
 
 ui::TextInputMode RenderWidgetHostViewAura::GetTextInputMode() const {
   return text_input_mode_;
 }
@@ skipping 1250 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content