Revert 233414 "x11: Move XInput2 availability information out of..."

trunk/src/ui/aura/root_window_host_x11.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 "ui/aura/root_window_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 79 matching lines @@
 
   // Receive resize events for the root-window so |x_root_bounds_| can be
   // updated.
   XWindowAttributes attr;
   XGetWindowAttributes(display, root_window, &attr);
   if (!(attr.your_event_mask & StructureNotifyMask)) {
     XSelectInput(display, root_window,
                  StructureNotifyMask | attr.your_event_mask);
   }
 
-  if (!ui::IsXInput2Available())
+  if (!base::MessagePumpForUI::HasXInput2())
     return;
 
   unsigned char mask[XIMaskLen(XI_LASTEVENT)] = {};
   memset(mask, 0, sizeof(mask));
 
   XISetMask(mask, XI_HierarchyChanged);
   XISetMask(mask, XI_KeyPress);
   XISetMask(mask, XI_KeyRelease);
 
   XIEventMask evmask;
@@ skipping 280 matching lines @@
 
   long event_mask = ButtonPressMask | ButtonReleaseMask | FocusChangeMask |
                     KeyPressMask | KeyReleaseMask |
                     EnterWindowMask | LeaveWindowMask |
                     ExposureMask | VisibilityChangeMask |
                     StructureNotifyMask | PropertyChangeMask |
                     PointerMotionMask;
   XSelectInput(xdisplay_, xwindow_, event_mask);
   XFlush(xdisplay_);
 
-  if (ui::IsXInput2Available())
+  if (base::MessagePumpForUI::HasXInput2())
     ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
 
   SelectEventsForRootWindow();
 
   // Get the initial size of the X root window.
   XWindowAttributes attrs;
   XGetWindowAttributes(xdisplay_, x_root_window_, &attrs);
   x_root_bounds_.SetRect(attrs.x, attrs.y, attrs.width, attrs.height);
 
   // TODO(erg): We currently only request window deletion events. We also
@@ skipping 638 matching lines @@
 
 void RootWindowHostX11::UpdateIsInternalDisplay() {
   RootWindow* root_window = GetRootWindow();
   gfx::Screen* screen = gfx::Screen::GetScreenFor(root_window);
   gfx::Display display = screen->GetDisplayNearestWindow(root_window);
   is_internal_display_ = display.IsInternal();
 }
 
 void RootWindowHostX11::SetCrOSTapPaused(bool state) {
 #if defined(OS_CHROMEOS)
-  if (!ui::IsXInput2Available())
-    return;
   // Temporarily pause tap-to-click when the cursor is hidden.
   Atom prop = atom_cache_.GetAtom("Tap Paused");
   unsigned char value = state;
   XIDeviceList dev_list =
       ui::DeviceListCacheX::GetInstance()->GetXI2DeviceList(xdisplay_);
 
   // Only slave pointer devices could possibly have tap-paused property.
   for (int i = 0; i < dev_list.count; i++) {
     if (dev_list[i].use == XISlavePointer) {
       Atom old_type;
@@ skipping 25 matching lines @@
 }
 
 namespace test {
 
 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
   default_override_redirect = override_redirect;
 }
 
 }  // namespace test
 }  // namespace aura