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

ui/views/widget/desktop_aura/desktop_screen_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/views/widget/desktop_aura/desktop_screen.h"
 
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
 #undef RootWindow
 
 #include "base/logging.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace {
 
 // TODO(erg): This method is a temporary hack, until we can reliably extract
 // location data out of XRandR.
 gfx::Size GetPrimaryDisplaySize() {
-  ::Display* display = ui::GetXDisplay();
+  ::XDisplay* display = gfx::GetXDisplay();
   ::Screen* screen = DefaultScreenOfDisplay(display);
   int width = WidthOfScreen(screen);
   int height = HeightOfScreen(screen);
 
   return gfx::Size(width, height);
 }
 
 class DesktopScreenX11 : public gfx::Screen {
  public:
   DesktopScreenX11();
@@ skipping 31 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, gfx::Screen implementation:
 
 bool DesktopScreenX11::IsDIPEnabled() {
   return false;
 }
 
 gfx::Point DesktopScreenX11::GetCursorScreenPoint() {
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
 
   ::Window root, child;
   int root_x, root_y, win_x, win_y;
   unsigned int mask;
   XQueryPointer(display,
                 DefaultRootWindow(display),
                 &root,
                 &child,
                 &root_x,
                 &root_y,
@@ skipping 63 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace views {
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views