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

trunk/src/ui/events/x/touch_factory_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/events/x/touch_factory_x11.h"
 
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/XIproto.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "ui/events/event_switches.h"
-#include "ui/events/x/device_data_manager.h"
 #include "ui/events/x/device_list_cache_x.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 TouchFactory::TouchFactory()
     : pointer_device_lookup_(),
       touch_device_available_(false),
       touch_events_disabled_(false),
       touch_device_list_(),
       id_generator_(0) {
-  if (!DeviceDataManager::GetInstance()->IsXInput2Available())
+#if defined(USE_AURA)
+  if (!base::MessagePumpForUI::HasXInput2())
     return;
+#endif
 
   XDisplay* display = gfx::GetXDisplay();
   UpdateDeviceList(display);
 
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   touch_events_disabled_ = cmdline->HasSwitch(switches::kTouchEvents) &&
       cmdline->GetSwitchValueASCII(switches::kTouchEvents) ==
           switches::kTouchEventsDisabled;
 }
 
@@ skipping 48 matching lines @@
   Atom xi_touchscreen = XInternAtom(display, XI_TOUCHSCREEN, false);
   for (int i = 0; i < dev_list.count; i++) {
     if (dev_list[i].type == xi_touchscreen) {
       touch_device_lookup_[dev_list[i].id] = true;
       touch_device_list_[dev_list[i].id] = false;
       touch_device_available_ = true;
     }
   }
 #endif
 
-  if (!DeviceDataManager::GetInstance()->IsXInput2Available())
-    return;
-
   // Instead of asking X for the list of devices all the time, let's maintain a
   // list of pointer devices we care about.
   // It should not be necessary to select for slave devices. XInput2 provides
   // enough information to the event callback to decide which slave device
   // triggered the event, thus decide whether the 'pointer event' is a
   // 'mouse event' or a 'touch event'.
   // However, on some desktops, some events from a master pointer are
   // not delivered to the client. So we select for slave devices instead.
   // If the touch device has 'GrabDevice' set and 'SendCoreEvents' unset (which
   // is possible), then the device is detected as a floating device, and a
@@ skipping 129 matching lines @@
        iter != devices.end(); ++iter) {
     DCHECK(*iter < touch_device_lookup_.size());
     touch_device_lookup_[*iter] = true;
     touch_device_list_[*iter] = true;
   }
   touch_device_available_ = true;
   touch_events_disabled_ = false;
 }
 
 }  // namespace ui