touch: Always expect XInput2 availability.

views/widget/native_widget_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/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 20 matching lines @@
 #include "views/ime/input_method_gtk.h"
 #include "views/views_delegate.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
 #include "views/widget/gtk_views_window.h"
 #include "views/widget/tooltip_manager_gtk.h"
 #include "views/widget/widget_delegate.h"
 #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"
 #endif
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
 using ui::ActiveWindowWatcherX;
 
 namespace views {
@@ skipping 242 matching lines @@
       is_active_(false),
       transient_to_parent_(false),
       got_initial_focus_in_(false),
       has_focus_(false),
       focus_on_creation_(true),
       always_on_top_(false),
       is_double_buffered_(false),
       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();
 #endif
   static bool installed_message_loop_observer = false;
   if (!installed_message_loop_observer) {
     installed_message_loop_observer = true;
     MessageLoopForUI* loop = MessageLoopForUI::current();
     if (loop)
       loop->AddObserver(DropObserver::GetInstance());
@@ skipping 734 matching lines @@
   // 2) widget_ is not drawable (mapped and visible)
   // 3) If it's never painted before. The first expose event will
   // paint the area that has to be painted.
   if (widget_ && GTK_WIDGET_DRAWABLE(widget_) && painted_) {
     gtk_widget_queue_draw_area(widget_, rect.x(), rect.y(), rect.width(),
                                rect.height());
   }
 }
 
 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);
 #endif
   // |window_contents_| is placed on top of |widget_|. So the cursor needs to be
   // set on |window_contents_| instead of |widget_|.
   if (window_contents_)
     gdk_window_set_cursor(window_contents_->window, cursor);
 }
 
@@ skipping 786 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views