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

chrome/browser/fullscreen_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 "chrome/browser/fullscreen.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // TODO (jianli): Merge with ui::EnumerateTopLevelWindows.
 void EnumerateAllChildWindows(ui::EnumerateWindowsDelegate* delegate,
                               XID window) {
   std::vector<XID> windows;
 
   if (!ui::GetXWindowStack(window, &windows)) {
     // Window Manager doesn't support _NET_CLIENT_LIST_STACKING, so fall back
     // to old school enumeration of all X windows.
     XID root, parent, *children;
     unsigned int num_children;
-    int status = XQueryTree(ui::GetXDisplay(), window, &root, &parent,
+    int status = XQueryTree(gfx::GetXDisplay(), window, &root, &parent,
                             &children, &num_children);
     if (status) {
       for (long i = static_cast<long>(num_children) - 1; i >= 0; i--)
         windows.push_back(children[i]);
       XFree(children);
     }
   }
 
   std::vector<XID>::iterator iter;
   for (iter = windows.begin(); iter != windows.end(); iter++) {
@@ skipping 94 matching lines @@
 }
 
 }
 
 bool IsFullScreenMode() {
   gdk_error_trap_push();
   bool result = IsTopMostWindowFullScreen();
   bool got_error = gdk_error_trap_pop();
   return result && !got_error;
 }