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

ui/base/cursor/cursor_loader_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/base/cursor/cursor_loader_x11.h"
 
 #include <float.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 
@@ skipping 128 matching lines @@
 
 }  // namespace
 
 namespace ui {
 
 CursorLoader* CursorLoader::Create() {
   return new CursorLoaderX11;
 }
 
 CursorLoaderX11::CursorLoaderX11()
-    : invisible_cursor_(CreateInvisibleCursor(), GetXDisplay()) {
+    : invisible_cursor_(CreateInvisibleCursor(), gfx::GetXDisplay()) {
 }
 
 CursorLoaderX11::~CursorLoaderX11() {
   UnloadAll();
 }
 
 void CursorLoaderX11::LoadImageCursor(int id,
                                       int resource_id,
                                       const gfx::Point& hot) {
   const gfx::ImageSkia* image =
@@ skipping 38 matching lines @@
     DCHECK_EQ(frame_width, cropped.width());
     DCHECK_EQ(frame_height, cropped.height());
 
     XcursorImage* x_image = SkBitmapToXcursorImage(&cropped, hotpoint);
 
     x_image->delay = frame_delay_ms;
     x_images->images[frame] = x_image;
   }
 
   animated_cursors_[id] = std::make_pair(
-      XcursorImagesLoadCursor(GetXDisplay(), x_images), x_images);
+      XcursorImagesLoadCursor(gfx::GetXDisplay(), x_images), x_images);
   // |bitmap| is owned by the resource bundle. So we do not need to free it.
 }
 
 void CursorLoaderX11::UnloadAll() {
   for (ImageCursorMap::const_iterator it = cursors_.begin();
        it != cursors_.end(); ++it)
     UnrefCustomXCursor(it->second);
 
   // Free animated cursors and images.
   for (AnimatedCursorMap::iterator it = animated_cursors_.begin();
        it != animated_cursors_.end(); ++it) {
     XcursorImagesDestroy(it->second.second);  // also frees individual frames.
-    XFreeCursor(GetXDisplay(), it->second.first);
+    XFreeCursor(gfx::GetXDisplay(), it->second.first);
   }
 }
 
 void CursorLoaderX11::SetPlatformCursor(gfx::NativeCursor* cursor) {
   DCHECK(cursor);
 
   ::Cursor xcursor;
   if (IsImageCursor(*cursor))
     xcursor = ImageCursorFromNative(*cursor);
   else if (*cursor == kCursorNone)
@@ skipping 65 matching lines @@
 
   *bitmap = skia::ImageOperations::Resize(
       *bitmap,
       skia::ImageOperations::RESIZE_BETTER,
       scaled_size.width(),
       scaled_size.height());
   *hotpoint = gfx::ToFlooredPoint(gfx::ScalePoint(*hotpoint, scale));
 }
 
 }  // namespace ui