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

content/browser/aura/software_output_device_x11.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 "content/browser/aura/software_output_device_x11.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/compositor/compositor.h"
 
 namespace content {
 
 SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor)
     : compositor_(compositor),
-      display_(ui::GetXDisplay()),
+      display_(gfx::GetXDisplay()),
       gc_(NULL),
       image_(NULL) {
   // TODO(skaslev) Remove this when crbug.com/180702 is fixed.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   gc_ = XCreateGC(display_, compositor_->widget(), 0, NULL);
 }
 
 SoftwareOutputDeviceX11::~SoftwareOutputDeviceX11() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 48 matching lines @@
     return;
 
   // TODO(skaslev): Maybe switch XShmPutImage since it's async.
   XPutImage(display_, compositor_->widget(), gc_, image_,
             rect.x(), rect.y(),
             rect.x(), rect.y(),
             rect.width(), rect.height());
 }
 
 }  // namespace content