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

ui/surface/transport_dib_gtk.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/surface/transport_dib.h"
 
 // Desktop GTK Linux builds use the old-style SYSV SHM based DIBs.
 
 #include <errno.h>
 #include <stdlib.h>
@@ skipping 115 matching lines @@
 }
 
 TransportDIB::Id TransportDIB::id() const {
   return key_;
 }
 
 TransportDIB::Handle TransportDIB::handle() const {
   return key_.shmkey;
 }
 
-XID TransportDIB::MapToX(Display* display) {
+XID TransportDIB::MapToX(XDisplay* display) {
   if (!x_shm_) {
     x_shm_ = ui::AttachSharedMemory(display, key_.shmkey);
     display_ = display;
   }
 
   return x_shm_;
 }
 
 void TransportDIB::DecreaseInFlightCounter() {
   CHECK(inflight_counter_);
   inflight_counter_--;
   if (!inflight_counter_ && detached_)
     delete this;
 }
 
 void TransportDIB::Detach() {
   CHECK(!detached_);
   detached_ = true;
   if (!inflight_counter_)
     delete this;
 }