touch: Always expect XInput2 availability.

views/events/event_x.cc

Index: views/events/event_x.cc
diff --git a/views/events/event_x.cc b/views/events/event_x.cc
index 3721fb26b6a67fc31eaca464fd79d06032d74585..45437a9811bc32dc1f27827a2a980b0d7035ffe2 100644
--- a/views/events/event_x.cc
+++ b/views/events/event_x.cc
@@ -6,19 +6,13 @@
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
-#if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
-#endif
-#include <X11/Xlib.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#include "views/widget/root_view.h"
-
-#if defined(HAVE_XINPUT2)
 #include "views/touchui/touch_factory.h"
-#endif
+#include "views/widget/root_view.h"
 
 namespace views {
 
@@ -69,7 +63,6 @@ int GetEventFlagsForButton(int button) {
   return 0;
 }
 
-#if defined(HAVE_XINPUT2)
 int GetButtonMaskForX2Event(XIDeviceEvent* xievent) {
   int buttonflags = 0;
 
@@ -121,8 +114,6 @@ int GetTouchIDFromXEvent(XEvent* xev) {
   return slot;
 }
 
-#endif  // HAVE_XINPUT2
-
 ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
   switch (native_event->type) {
     case KeyPress:
@@ -144,7 +135,6 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
           (Button1Mask | Button2Mask | Button3Mask))
         return ui::ET_MOUSE_DRAGGED;
       return ui::ET_MOUSE_MOVED;
-#if defined(HAVE_XINPUT2)
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
@@ -162,7 +152,6 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
               ui::ET_MOUSE_MOVED;
       }
     }
-#endif
     default:
       NOTREACHED();
       break;
@@ -171,12 +160,10 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
 }
 
 int GetMouseWheelOffset(XEvent* xev) {
-#if defined(HAVE_XINPUT2)
   if (xev->type == GenericEvent) {
     XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
     return xiev->detail == 4 ? kWheelScrollAmount : -kWheelScrollAmount;
   }
-#endif
   return xev->xbutton.button == 4 ? kWheelScrollAmount : -kWheelScrollAmount;
 }
 
@@ -189,14 +176,12 @@ gfx::Point GetEventLocation(XEvent* xev) {
     case MotionNotify:
       return gfx::Point(xev->xmotion.x, xev->xmotion.y);
 
-#if defined(HAVE_XINPUT2)
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(xev->xcookie.data);
       return gfx::Point(static_cast<int>(xievent->event_x),
                         static_cast<int>(xievent->event_y));
     }
-#endif
   }
 
   return gfx::Point();
@@ -212,7 +197,6 @@ int GetLocatedEventFlags(XEvent* xev) {
     case MotionNotify:
       return GetEventFlagsFromXState(xev->xmotion.state);
 
-#if defined(HAVE_XINPUT2)
     case GenericEvent: {
       XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data);
       bool touch =
@@ -229,7 +213,6 @@ int GetLocatedEventFlags(XEvent* xev) {
                   GetEventFlagsFromXState(xievent->mods.effective);
       }
     }
-#endif
   }
 
   return 0;
@@ -247,33 +230,23 @@ uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
 
 float GetTouchRadiusFromXEvent(XEvent* xev) {
   float diameter = 0.0;
-
-#if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   touch_factory->ExtractTouchParam(*xev, TouchFactory::TP_TOUCH_MAJOR,
                                    &diameter);
-#endif
-
   return diameter / 2.0;
 }
 
 float GetTouchAngleFromXEvent(XEvent* xev) {
   float angle = 0.0;
-
-#if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   touch_factory->ExtractTouchParam(*xev, TouchFactory::TP_ORIENTATION,
                                    &angle);
-#endif
-
   return angle;
 }
 
 
 float GetTouchRatioFromXEvent(XEvent* xev) {
   float ratio = 1.0;
-
-#if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   float major_v = -1.0;
   float minor_v = -1.0;
@@ -289,7 +262,6 @@ float GetTouchRatioFromXEvent(XEvent* xev) {
   // In case minor axis exists but is zero.
   if (minor_v > 0.0)
     ratio = major_v / minor_v;
-#endif
 
   return ratio;
 }
@@ -416,7 +388,6 @@ MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
-#if defined(HAVE_XINPUT2)
 TouchEvent::TouchEvent(NativeEvent2 native_event_2,
                        FromNativeEvent2 from_native)
     : LocatedEvent(native_event_2, from_native),
@@ -433,6 +404,5 @@ TouchEvent::TouchEvent(NativeEvent2 native_event_2,
     }
   }
 }
-#endif
 
 }  // namespace views