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

Unified Diff: ui/ozone/platform/drm/host/drm_window_host.cc

Issue 1412623006: Developer Feature: Add Debug Accelerators to Toggle Touchscreen/Touchpad On or Off (CrOS) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error 2 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/ozone/platform/drm/host/drm_window_host.cc
diff --git a/ui/ozone/platform/drm/host/drm_window_host.cc b/ui/ozone/platform/drm/host/drm_window_host.cc
index 4255904d35ade178e2267d5e8a070c407cb7b4f2..ade4e0b17f5e7752c69001abb858add2baa21316 100644
--- a/ui/ozone/platform/drm/host/drm_window_host.cc
+++ b/ui/ozone/platform/drm/host/drm_window_host.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/drm/host/drm_window_host.h"
#include "base/bind.h"
+#include "ui/events/base_event_utils.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/event.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ -138,6 +139,9 @@ bool DrmWindowHost::CanDispatchEvent(const PlatformEvent& ne) {
return grabber == widget_;
if (event->IsTouchEvent()) {
+ if (!ui::AreTouchEventsEnabled())
spang 2015/11/03 22:11:45 If you must do this, this isn't the right place.
afakhry 2015/11/04 02:28:21 ui/base/touch has been removed from DEPS since it'
+ return false;
+
// Dispatch the event if it is from the touchscreen associated with the
// DrmWindowHost. We cannot check the event's location because if the
// touchscreen has a bezel, touches in the bezel have a location outside of
« ui/ozone/DEPS ('K') | « ui/ozone/DEPS ('k') | ui/ozone/public/input_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698