touch: Always expect XInput2 availability.

views/controls/menu/menu_host_gtk.cc

 // Copyright (c) 2011 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 "views/controls/menu/menu_host_gtk.h"
 
 #include <gdk/gdk.h>
 
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
 #include <gdk/gdkx.h>
 #include <X11/extensions/XInput2.h>
 #endif
 
 #include "views/controls/menu/native_menu_host_delegate.h"
 
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
 #include "views/touchui/touch_factory.h"
 #endif
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHostGtk, public:
 
 MenuHostGtk::MenuHostGtk(internal::NativeMenuHostDelegate* delegate)
     : NativeWidgetGtk(delegate->AsNativeWidgetDelegate()),
@@ skipping 30 matching lines @@
   GdkGrabStatus keyboard_grab_status =
       gdk_keyboard_grab(window_contents()->window, FALSE,
                         GDK_CURRENT_TIME);
 
   did_input_grab_ = pointer_grab_status == GDK_GRAB_SUCCESS &&
       keyboard_grab_status == GDK_GRAB_SUCCESS;
 
   DCHECK_EQ(GDK_GRAB_SUCCESS, pointer_grab_status);
   DCHECK_EQ(GDK_GRAB_SUCCESS, keyboard_grab_status);
 
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
   ::Window window = GDK_WINDOW_XID(window_contents()->window);
   Display* display = GDK_WINDOW_XDISPLAY(window_contents()->window);
   bool xi2grab = TouchFactory::GetInstance()->GrabTouchDevices(display, window);
   did_input_grab_ = did_input_grab_ && xi2grab;
 #endif
 
   DCHECK(did_input_grab_);
   // need keyboard grab.
 }
 
@@ skipping 11 matching lines @@
   gtk_window_set_type_hint(GTK_WINDOW(GetNativeView()),
                            GDK_WINDOW_TYPE_HINT_MENU);
 }
 
 void MenuHostGtk::ReleaseMouseCapture() {
   NativeWidgetGtk::ReleaseMouseCapture();
   if (did_input_grab_) {
     did_input_grab_ = false;
     gdk_pointer_ungrab(GDK_CURRENT_TIME);
     gdk_keyboard_ungrab(GDK_CURRENT_TIME);
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
     TouchFactory::GetInstance()->UngrabTouchDevices(
         GDK_WINDOW_XDISPLAY(window_contents()->window));
 #endif
   }
 }
 
 void MenuHostGtk::OnDestroy(GtkWidget* object) {
   delegate_->OnNativeMenuHostDestroy();
   NativeWidgetGtk::OnDestroy(object);
 }
@@ skipping 19 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuHost, public:
 
 // static
 NativeMenuHost* NativeMenuHost::CreateNativeMenuHost(
     internal::NativeMenuHostDelegate* delegate) {
   return new MenuHostGtk(delegate);
 }
 
 }  // namespace views