I managed to break test_shell. Reverting. I'll fix tomorrow.

Reverts r14075


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14080 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 30 deletions

diff --git a/chrome/common/x11_util.cc b/chrome/common/x11_util.cc
index 83fc02a..d10c320 100644
--- a/chrome/common/x11_util.cc
+++ b/chrome/common/x11_util.cc
@@ -6,7 +6,6 @@
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
-#include "base/thread.h"
 #include "chrome/common/x11_util.h"
 #include "chrome/common/x11_util_internal.h"
 
@@ -99,10 +98,6 @@ bool QueryRenderSupport(Display* dpy) {
   return render_supported;
 }
 
-int GetDefaultScreen(Display* display) {
-  return XDefaultScreen(display);
-}
-
 XID GetX11RootWindow() {
   return GDK_WINDOW_XID(gdk_get_default_root_window());
 }
@@ -111,10 +106,6 @@ XID GetX11WindowFromGtkWidget(GtkWidget* widget) {
   return GDK_WINDOW_XID(widget->window);
 }
 
-XID GetX11WindowFromGdkWindow(GdkWindow* window) {
-  return GDK_WINDOW_XID(window);
-}
-
 void* GetVisualFromGtkWidget(GtkWidget* widget) {
   return GDK_VISUAL_XVISUAL(gtk_widget_get_visual(widget));
 }
@@ -228,25 +219,4 @@ void FreePixmap(Display* display, XID pixmap) {
   XFreePixmap(display, pixmap);
 }
 
-// Called on BACKGROUND_X11 thread.
-Display* GetSecondaryDisplay() {
-  static Display* display = NULL;
-  if (!display) {
-    display = XOpenDisplay(NULL);
-    CHECK(display);
-  }
-
-  return display;
-}
-
-// Called on BACKGROUND_X11 thread.
-void GetWindowGeometry(int* x, int* y, unsigned* width, unsigned* height,
-                       XID window) {
-  Window root_window;
-  unsigned border_width, depth;
-
-  CHECK(XGetGeometry(GetSecondaryDisplay(), window,
-                     &root_window, x, y, width, height, &border_width, &depth));
-}
-
 }  // namespace x11_util