GTK: Create the start of a compatibility header wrapping deprecated methods.

webkit/tools/test_shell/test_shell_gtk.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.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
 #include <signal.h>
 #include <unistd.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "grit/test_shell_resources.h"
 #include "grit/webkit_resources.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 using WebKit::WebPoint;
 using WebKit::WebWidget;
@@ skipping 386 matching lines @@
   signal(SIGALRM, SIG_DFL);
 }
 
 void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
   GtkWidget* widget = GTK_WIDGET(host->view_handle());
 
   if (enable) {
     gtk_widget_grab_focus(widget);
   } else if (gtk_widget_is_focus(widget)) {
     GtkWidget *toplevel = gtk_widget_get_toplevel(widget);
-    if (GTK_WIDGET_TOPLEVEL(toplevel))
+    if (gtk_widget_is_toplevel(toplevel))
       gtk_window_set_focus(GTK_WINDOW(toplevel), NULL);
   }
 }
 
 void TestShell::DestroyWindow(gfx::NativeWindow windowHandle) {
   RemoveWindowFromList(windowHandle);
   gtk_widget_destroy(GTK_WIDGET(windowHandle));
 }
 
 WebWidget* TestShell::CreatePopupWidget() {
@@ skipping 128 matching lines @@
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
       break;
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
   return TestShell::ResourceProvider(resource_id);
 }
 
 }  // namespace webkit_glue