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

content/browser/renderer_host/gtk_window_utils.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 "content/browser/renderer_host/gtk_window_utils.h"
 
 #include <X11/Xlib.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <vector>
 
+#include "third_party/WebKit/public/web/WebScreenInfo.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_compat.h"
 #include "ui/gfx/rect.h"
-#include "third_party/WebKit/public/web/WebScreenInfo.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace content {
 
 namespace {
 
 // Returns the region of |window|'s desktop that isn't occupied by docks or
 // panels.  Returns an empty rect on failure.
 gfx::Rect GetWorkArea(Window window) {
   Window root = ui::GetX11RootWindow();
   int desktop = -1;
@@ skipping 10 matching lines @@
     return gfx::Rect();
 
   size_t start_index = 4 * desktop;
   if (property.size() < start_index + 4)
     return gfx::Rect();
 
   return gfx::Rect(property[start_index], property[start_index + 1],
                    property[start_index + 2], property[start_index + 3]);
 }
 
-WebKit::WebScreenInfo GetScreenInfo(Display* display, int screenNumber) {
+WebKit::WebScreenInfo GetScreenInfo(XDisplay* display, int screenNumber) {
   // XDisplayWidth() and XDisplayHeight() return cached values. To ensure that
   // we return the correct dimensions after the screen is resized, query the
   // root window's geometry each time.
   Window root = RootWindow(display, screenNumber);
   Window root_ret;
   int x, y;
   unsigned int width, height, border, depth;
   XGetGeometry(
       display, root, &root_ret, &x, &y, &width, &height, &border, &depth);
 
@@ skipping 21 matching lines @@
                                   monitor_rect.width, monitor_rect.height);
 
   gfx::Rect available_rect = results->rect;
   gfx::Rect work_area = GetWorkArea(GDK_WINDOW_XID(gdk_window));
   if (!work_area.IsEmpty())
     available_rect.Intersect(work_area);
   results->availableRect = available_rect;
 }
 
 }  // namespace content