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

Unified Diff: ui/events/base_event_utils.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: oshima'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
Index: ui/events/base_event_utils.cc
diff --git a/ui/events/base_event_utils.cc b/ui/events/base_event_utils.cc
index 313a37cb15c876f5d51d4eee920c3ced806182b5..900da2e8f1b142a6143afb0053aa79a9a007dfef 100644
--- a/ui/events/base_event_utils.cc
+++ b/ui/events/base_event_utils.cc
@@ -6,9 +6,21 @@
#include "base/atomic_sequence_num.h"
#include "base/logging.h"
+#include "ui/events/event_constants.h"
namespace ui {
+namespace {
+
+#if defined(OS_CHROMEOS)
+const int kModifierMask = EF_ALT_DOWN | EF_COMMAND_DOWN;
kpschoedel 2015/09/04 18:06:13 nit: kSystemKeyModifierMask for consistency
afakhry 2015/09/04 18:26:35 Done.
+#else
+const int kModifierMask = EF_ALT_DOWN;
+#endif // defined(OS_CHROMEOS)
+
+
+} // namespace
+
base::StaticAtomicSequenceNumber g_next_event_id;
uint32 GetNextTouchEventId() {
@@ -21,5 +33,10 @@ uint32 GetNextTouchEventId() {
return id;
}
+bool IsSystemKeyModifier(int flags, bool allow_altgr) {
+ return (allow_altgr || (flags & EF_ALTGR_DOWN) == 0) &&
+ (kModifierMask & flags) != 0;
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698