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

Unified Diff: ui/events/base_event_utils.h

Issue 1453813003: Fix a regression in checking the status of the touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use the master switch on ozone as well. Created 5 years, 1 month 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.h
diff --git a/ui/events/base_event_utils.h b/ui/events/base_event_utils.h
index f6595801b6fdd6889babb73591405f0547fb9735..ef02739ef44efa70a4a2ad60d14d83228291b8ea 100644
--- a/ui/events/base_event_utils.h
+++ b/ui/events/base_event_utils.h
@@ -18,15 +18,12 @@ EVENTS_BASE_EXPORT uint32 GetNextTouchEventId();
EVENTS_BASE_EXPORT bool IsSystemKeyModifier(int flags);
#if defined(OS_CHROMEOS)
-// Sets the status of touch events to |enabled| on ChromeOS only. Non-ChromeOS
-// platforms depend on the state of the |kTouchEvents| flags.
-EVENTS_BASE_EXPORT void SetTouchEventsEnabled(bool enabled);
+// On ChromeOS, touch events can be turned off completely using a debug
+// accelerator using the following functions.
+EVENTS_BASE_EXPORT void SetTouchEventsCrOsMasterSwitch(bool enabled);
+EVENTS_BASE_EXPORT bool GetTouchEventsCrOsMasterSwitch();
#endif // defined(OS_CHROMEOS)
-// Returns true if the touch events are enabled. On non-ChromeOS platforms, this
-// depends on the state of the |kTouchEvents| flags.
-EVENTS_BASE_EXPORT bool AreTouchEventsEnabled();
-
} // namespace ui
#endif // UI_EVENTS_BASE_EVENT_UTILS_H_

Powered by Google App Engine
This is Rietveld 408576698