diff options
| author | Sadrul Habib Chowdhury <sadrul@chromium.org> | 2014-11-12 18:21:51 -0500 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@chromium.org> | 2014-11-12 23:22:39 +0000 |
| commit | 4ae87941c77264d9271afdf939381962c4f45bd2 (patch) | |
| tree | 7906ec3824f4f4575660fc3f22e1403de5e17716 /ash/touch | |
| parent | 2cab606effc4c7feda7bd5392f171f356d21a9e8 (diff) | |
| download | chromium_src-4ae87941c77264d9271afdf939381962c4f45bd2.zip chromium_src-4ae87941c77264d9271afdf939381962c4f45bd2.tar.gz chromium_src-4ae87941c77264d9271afdf939381962c4f45bd2.tar.bz2 | |
x11: Always require XI2.2 for X11.
This removes the use_xi2_mt gyp variable, and USE_XI2_MT define from the
code. XI2.2 is now available on all supported linux platforms.
BUG=291141
R=brettw@chromium.org, derat@chromium.org, erg@chromium.org
Review URL: https://codereview.chromium.org/706763003
Cr-Commit-Position: refs/heads/master@{#303918}
Diffstat (limited to 'ash/touch')
| -rw-r--r-- | ash/touch/touch_hud_debug.cc | 2 | ||||
| -rw-r--r-- | ash/touch/touch_uma.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc index 1220822..ad97960 100644 --- a/ash/touch/touch_hud_debug.cc +++ b/ash/touch/touch_hud_debug.cc @@ -72,7 +72,7 @@ const char* GetTouchEventLabel(ui::EventType type) { int GetTrackingId(const ui::TouchEvent& event) { if (!event.HasNativeEvent()) return 0; -#if defined(USE_XI2_MT) +#if defined(USE_X11) ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance(); double tracking_id; if (manager->GetEventData(*event.native_event(), diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index 014dfa9..fdac10c 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -16,7 +16,7 @@ #include "ui/events/event_utils.h" #include "ui/gfx/point_conversions.h" -#if defined(USE_XI2_MT) +#if defined(USE_X11) #include <X11/extensions/XInput2.h> #include <X11/Xlib.h> #endif @@ -103,7 +103,7 @@ void TouchUMA::RecordTouchEvent(aura::Window* target, // Prefer raw event location (when available) over calibrated location. if (event.HasNativeEvent()) { -#if defined(USE_XI2_MT) +#if defined(USE_X11) XEvent* xevent = event.native_event(); CHECK_EQ(GenericEvent, xevent->type); XIEvent* xievent = static_cast<XIEvent*>(xevent->xcookie.data); |