Ignore inserting character with Search as a modifier on ChromeOS

ui/views/controls/textfield/textfield.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 "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/trace_event/trace_event.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/touch/selection_bound.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/canvas_painter.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/focusable_border.h"
@@ skipping 1412 matching lines @@
   if (GetRenderText()->insert_mode())
     model_->InsertText(new_text);
   else
     model_->ReplaceText(new_text);
   skip_input_method_cancel_composition_ = false;
   UpdateAfterChange(true, true);
   OnAfterUserAction();
 }
 
 void Textfield::InsertChar(base::char16 ch, int flags) {
-  const int kControlModifierMask = ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
-                                   ui::EF_COMMAND_DOWN | ui::EF_ALTGR_DOWN |
-                                   ui::EF_MOD3_DOWN;
-
   // Filter out all control characters, including tab and new line characters,
-  // and all characters with Alt modifier. But allow characters with the AltGr
-  // modifier. On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a
-  // different flag that we don't care about.
+  // and all characters with Alt modifier (and Search on ChromeOS). But allow
+  // characters with the AltGr modifier. On Windows AltGr is represented by
+  // Alt+Ctrl, and on Linux it's a different flag that we don't care about.
   const bool should_insert_char =
       ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
-      (flags & kControlModifierMask) != ui::EF_ALT_DOWN;
+      !ui::IsSystemKeyModifier(flags);
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE || !should_insert_char)
     return;
 
   DoInsertChar(ch);
 
   if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD &&
       password_reveal_duration_ != base::TimeDelta()) {
     const size_t change_offset = model_->GetCursorPosition();
     DCHECK_GT(change_offset, 0u);
     RevealPasswordChar(change_offset - 1);
@@ skipping 419 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views