Chromium Code Reviews| Index: ui/events/base_event_utils.cc |
| diff --git a/ui/events/base_event_utils.cc b/ui/events/base_event_utils.cc |
| index ffff0f1da12e42f4475ba7fcd36d22c80f50b82f..17aafdb46284aca3acd3832aa7c58537e7f32c04 100644 |
| --- a/ui/events/base_event_utils.cc |
| +++ b/ui/events/base_event_utils.cc |
| @@ -5,8 +5,10 @@ |
| #include "ui/events/base_event_utils.h" |
| #include "base/atomic_sequence_num.h" |
| +#include "base/command_line.h" |
| #include "base/logging.h" |
| #include "ui/events/event_constants.h" |
| +#include "ui/events/event_switches.h" |
| namespace ui { |
| @@ -14,11 +16,14 @@ namespace { |
| #if defined(OS_CHROMEOS) |
| const int kSystemKeyModifierMask = EF_ALT_DOWN | EF_COMMAND_DOWN; |
| + |
| +// Determines whether touch events are enabled or disabled on ChromeOS only. |
| +bool touch_events_enabled = true; |
| + |
| #else |
| const int kSystemKeyModifierMask = EF_ALT_DOWN; |
| #endif // defined(OS_CHROMEOS) |
| - |
| } // namespace |
| base::StaticAtomicSequenceNumber g_next_event_id; |
| @@ -40,5 +45,36 @@ bool IsSystemKeyModifier(int flags) { |
| (EF_ALTGR_DOWN & flags) == 0; |
| } |
| +#if defined(OS_CHROMEOS) |
| + |
| +void SetTouchEventsEnabled(bool enabled) { |
| + touch_events_enabled = enabled; |
| +} |
| + |
| +#endif // defined(OS_CHROMEOS) |
| + |
| +bool AreTouchEventsEnabled() { |
| +#if defined(OS_CHROMEOS) |
| + return touch_events_enabled; |
| +#else |
| + const base::CommandLine& command_line = |
| + *base::CommandLine::ForCurrentProcess(); |
| + const std::string touch_enabled_switch = |
| + command_line.HasSwitch(switches::kTouchEvents) ? |
| + command_line.GetSwitchValueASCII(switches::kTouchEvents) : |
| + switches::kTouchEventsAuto; |
| + |
| + if (touch_enabled_switch.empty() || |
| + touch_enabled_switch == switches::kTouchEventsEnabled || |
| + touch_enabled_switch == switches::kTouchEventsAuto) { |
| + return true; |
| + } |
| + |
| + if (touch_enabled_switch != switches::kTouchEventsDisabled) |
| + LOG(ERROR) << "Invalid --touch-events option: " << touch_enabled_switch; |
| + return false; |
|
sadrul
2015/11/03 19:09:26
We need to cache the return value, so we don't hav
afakhry
2015/11/04 02:28:21
Done.
|
| +#endif // defined(OS_CHROMEOS) |
| +} |
| + |
| } // namespace ui |