x11: Always require XI2.2 for X11.

ash/touch/touch_uma.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/touch/touch_uma.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 #include "ui/events/event.h"
 #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
 
 namespace {
 
 struct WindowTouchDetails {
   // Move and start times of the touch points. The key is the touch-id.
   std::map<int, base::TimeDelta> last_move_time_;
   std::map<int, base::TimeDelta> last_start_time_;
@@ skipping 66 matching lines @@
   const gfx::Rect bounds = target->GetRootWindow()->bounds();
   const int bucket_size_x = std::max(1,
                                      bounds.width() / kBucketCountForLocation);
   const int bucket_size_y = std::max(1,
                                      bounds.height() / kBucketCountForLocation);
 
   gfx::Point position = event.root_location();
 
   // 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);
     if (xievent->evtype == XI_TouchBegin ||
         xievent->evtype == XI_TouchUpdate ||
         xievent->evtype == XI_TouchEnd) {
       XIDeviceEvent* device_event =
           static_cast<XIDeviceEvent*>(xevent->xcookie.data);
       position.SetPoint(static_cast<int>(device_event->event_x),
                         static_cast<int>(device_event->event_y));
@@ skipping 186 matching lines @@
       return GESTURE_OMNIBOX_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_OMNIBOX_PINCH;
     return GESTURE_UNKNOWN;
   }
 
   return GESTURE_UNKNOWN;
 }
 
 }  // namespace ash