GTK: Port to gdk_x11_window_lookup_for_display

ui/base/x/x11_util.cc

 // Copyright (c) 2011 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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 13 matching lines @@
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
+#include "ui/base/gtk/gtk_compat.h"
 #else
 // TODO(sad): Use the new way of handling X errors when
 // http://codereview.chromium.org/7889040/ lands.
 #define gdk_error_trap_push()
 #define gdk_error_trap_pop() false
 #define gdk_flush()
 #endif
 
 namespace ui {
 
@@ skipping 199 matching lines @@
 XID GetX11WindowFromGtkWidget(GtkWidget* widget) {
   return GDK_WINDOW_XID(widget->window);
 }
 
 XID GetX11WindowFromGdkWindow(GdkWindow* window) {
   return GDK_WINDOW_XID(window);
 }
 
 GtkWindow* GetGtkWindowFromX11Window(XID xid) {
   GdkWindow* gdk_window =
-      gdk_window_lookup_for_display(gdk_display_get_default(), xid);
+      gdk_x11_window_lookup_for_display(gdk_display_get_default(), xid);
   if (!gdk_window)
     return NULL;
   GtkWindow* gtk_window = NULL;
   gdk_window_get_user_data(gdk_window,
                            reinterpret_cast<gpointer*>(&gtk_window));
   if (!gtk_window)
     return NULL;
   return gtk_window;
 }
 
@@ skipping 668 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui