Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h

ui/base/x/device_data_manager.cc

 // Copyright 2013 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/base/x/device_data_manager.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
@@ skipping 98 matching lines @@
 bool DeviceDataManager::IsTouchDataType(const int type) {
   return (type >= kTouchDataTypeStart) && (type <= kTouchDataTypeEnd);
 }
 
 DeviceDataManager* DeviceDataManager::GetInstance() {
   return Singleton<DeviceDataManager>::get();
 }
 
 DeviceDataManager::DeviceDataManager()
     : natural_scroll_enabled_(false),
-      atom_cache_(ui::GetXDisplay(), kCachedAtoms) {
+      atom_cache_(gfx::GetXDisplay(), kCachedAtoms) {
   InitializeXInputInternal();
 
   // Make sure the sizes of enum and kCachedAtoms are aligned.
   CHECK(arraysize(kCachedAtoms) == static_cast<size_t>(DT_LAST_ENTRY) + 1);
-  UpdateDeviceList(ui::GetXDisplay());
+  UpdateDeviceList(gfx::GetXDisplay());
 }
 
 DeviceDataManager::~DeviceDataManager() {
 }
 
 bool DeviceDataManager::InitializeXInputInternal() {
   // Check if XInput is available on the system.
   xi_opcode_ = -1;
   int opcode, event, error;
   if (!XQueryExtension(
-      ui::GetXDisplay(), "XInputExtension", &opcode, &event, &error)) {
+      gfx::GetXDisplay(), "XInputExtension", &opcode, &event, &error)) {
     VLOG(1) << "X Input extension not available: error=" << error;
     return false;
   }
   xi_opcode_ = opcode;
 
   // Check the XInput version.
 #if defined(USE_XI2_MT)
   int major = 2, minor = USE_XI2_MT;
 #else
   int major = 2, minor = 0;
 #endif
-  if (XIQueryVersion(ui::GetXDisplay(), &major, &minor) == BadRequest) {
+  if (XIQueryVersion(gfx::GetXDisplay(), &major, &minor) == BadRequest) {
     VLOG(1) << "XInput2 not supported in the server.";
     return false;
   }
 
   // Possible XI event types for XIDeviceEvent. See the XI2 protocol
   // specification.
   xi_device_event_types_[XI_KeyPress] = true;
   xi_device_event_types_[XI_KeyRelease] = true;
   xi_device_event_types_[XI_ButtonPress] = true;
   xi_device_event_types_[XI_ButtonRelease] = true;
@@ skipping 419 matching lines @@
                                                  int val_index,
                                                  DataType data_type,
                                                  double min,
                                                  double max) {
   valuator_lookup_[deviceid][data_type] = val_index;
   data_type_lookup_[deviceid][val_index] = data_type;
   valuator_min_[deviceid][data_type] = min;
   valuator_max_[deviceid][data_type] = max;
 }
 }  // namespace ui