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

Unified Diff: ui/views/controls/textfield/textfield.cc

Issue 1325333002: Ignore inserting character with Search as a modifier on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: kpschoedel's comments 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 | « ui/events/base_event_utils.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 4ae5f1acbc167a1f0a5d38ddf55cdc471cec525a..d3b684c449f1c989f45422f70df5cbfbeb23bc7b 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -17,6 +17,7 @@
#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"
@@ -1449,17 +1450,13 @@ void Textfield::InsertText(const base::string16& new_text) {
}
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;
« no previous file with comments | « ui/events/base_event_utils.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698