touch: Always expect XInput2 availability.

views/widget/native_widget_gtk.cc

Index: views/widget/native_widget_gtk.cc
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index 186f8ef7f29311c515486ea7ce607c4ea4b4fd38..9221d3a2abefcdf1d4892db951395a1fb65bb4cc 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -38,13 +38,11 @@
 #include "views/window/native_window_gtk.h"
 
 #if defined(TOUCH_UI)
-#if defined(HAVE_XINPUT2)
 #include <gdk/gdkx.h>
 
 #include "ui/gfx/gtk_util.h"
 #include "views/touchui/touch_factory.h"
 #endif
-#endif
 
 #if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
@@ -307,7 +305,7 @@ NativeWidgetGtk::NativeWidgetGtk(internal::NativeWidgetDelegate* delegate)
       should_handle_menu_key_release_(false),
       dragged_view_(NULL),
       painted_(false) {
-#if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
   // Make sure the touch factory is initialized so that it can setup XInput2 for
   // the widget.
   TouchFactory::GetInstance();
@@ -1062,7 +1060,7 @@ void NativeWidgetGtk::SchedulePaintInRect(const gfx::Rect& rect) {
 }
 
 void NativeWidgetGtk::SetCursor(gfx::NativeCursor cursor) {
-#if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
   if (!TouchFactory::GetInstance()->is_cursor_visible() &&
       !TouchFactory::GetInstance()->keep_mouse_cursor())
     cursor = gfx::GetCursor(GDK_BLANK_CURSOR);