Eliminate remaining WebCore dependencies from webplugin_impl.cc...

webkit/tools/test_shell/test_webview_delegate_gtk.cc

 // Copyright (c) 2008 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 was forked off the Mac port.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
@@ skipping 64 matching lines @@
                            reinterpret_cast<const guchar*>(selection.data()),
                            selection.length());
   } else {
     gtk_selection_data_set_text(selection_data, selection.data(),
         selection.length());
   }
 }
 
 }  // namespace
 
-// WebViewDelegate -----------------------------------------------------------
-
-WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
-    WebView* webview,
-    const GURL& url,
-    const std::string& mime_type,
-    const std::string& clsid,
-    std::string* actual_mime_type) {
-  bool allow_wildcard = true;
-  WebPluginInfo info;
-  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(url, mime_type, clsid,
-                                                     allow_wildcard, &info,
-                                                     actual_mime_type))
-    return NULL;
-
-  const std::string& mtype =
-      (actual_mime_type && !actual_mime_type->empty()) ? *actual_mime_type
-                                                       : mime_type;
-  // TODO(evanm): we probably shouldn't be doing this mapping to X ids at
-  // this level.
-  GdkNativeWindow plugin_parent =
-      GDK_WINDOW_XWINDOW(shell_->webViewHost()->view_handle()->window);
-
-  return WebPluginDelegateImpl::Create(info.path, mtype, plugin_parent);
-}
-
-void TestWebViewDelegate::CreatedPluginWindow(gfx::PluginWindowHandle id) {
-  shell_->webViewHost()->CreatePluginContainer(id);
-}
-
-void TestWebViewDelegate::WillDestroyPluginWindow(gfx::PluginWindowHandle id) {
-  shell_->webViewHost()->DestroyPluginContainer(id);
-}
+// WebViewDelegate ------------------------------------------------------------
 
 void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
   GtkWidget* dialog = gtk_message_dialog_new(
       shell_->mainWnd(), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
       GTK_BUTTONS_OK, "%s", WideToUTF8(message).c_str());
   gtk_window_set_title(GTK_WINDOW(dialog), "JavaScript Alert");
   gtk_dialog_run(GTK_DIALOG(dialog));  // Runs a nested message loop.
   gtk_widget_destroy(dialog);
 }
 
+// WebWidgetClient ------------------------------------------------------------
+
 void TestWebViewDelegate::show(WebNavigationPolicy policy) {
   WebWidgetHost* host = GetWidgetHost();
   GtkWidget* drawing_area = host->view_handle();
   GtkWidget* window =
       gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
   gtk_widget_show_all(window);
 }
 
 void TestWebViewDelegate::closeWidgetSoon() {
   if (this == shell_->delegate()) {
@@ skipping 75 matching lines @@
     return WebRect(x, y, width, height);
   }
   return WebRect();
 }
 
 WebRect TestWebViewDelegate::windowResizerRect() {
   // Not necessary on Linux.
   return WebRect();
 }
 
-void TestWebViewDelegate::DidMovePlugin(const WebPluginGeometry& move) {
+void TestWebViewDelegate::runModal() {
+  NOTIMPLEMENTED();
+}
+
+// WebPluginPageDelegate ------------------------------------------------------
+
+webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
+    const GURL& url,
+    const std::string& mime_type,
+    const std::string& clsid,
+    std::string* actual_mime_type) {
+  bool allow_wildcard = true;
+  WebPluginInfo info;
+  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(url, mime_type, clsid,
+                                                     allow_wildcard, &info,
+                                                     actual_mime_type))
+    return NULL;
+
+  const std::string& mtype =
+      (actual_mime_type && !actual_mime_type->empty()) ? *actual_mime_type
+                                                       : mime_type;
+  // TODO(evanm): we probably shouldn't be doing this mapping to X ids at
+  // this level.
+  GdkNativeWindow plugin_parent =
+      GDK_WINDOW_XWINDOW(shell_->webViewHost()->view_handle()->window);
+
+  return WebPluginDelegateImpl::Create(info.path, mtype, plugin_parent);
+}
+
+void TestWebViewDelegate::CreatedPluginWindow(
+    gfx::PluginWindowHandle id) {
+  shell_->webViewHost()->CreatePluginContainer(id);
+}
+
+void TestWebViewDelegate::WillDestroyPluginWindow(
+    gfx::PluginWindowHandle id) {
+  shell_->webViewHost()->DestroyPluginContainer(id);
+}
+
+void TestWebViewDelegate::DidMovePlugin(
+    const webkit_glue::WebPluginGeometry& move) {
   WebWidgetHost* host = GetWidgetHost();
   GtkPluginContainerManager* plugin_container_manager =
       static_cast<WebViewHost*>(host)->plugin_container_manager();
   plugin_container_manager->MovePluginContainer(move);
 }
 
-void TestWebViewDelegate::runModal() {
-  NOTIMPLEMENTED();
-}
+// Public methods -------------------------------------------------------------
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   if (is_empty_selection)
     return;
 
   GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
   // Put data on the X clipboard.  This doesn't actually grab the text from
   // the HTML, it just registers a callback for when someone tries to paste.
   GtkTargetList* target_list = gtk_target_list_new(NULL, 0);
   gtk_target_list_add(target_list, GetTextHtmlAtom(), 0, TEXT_HTML);
   gtk_target_list_add_text_targets(target_list, PLAIN_TEXT);
 
   gint num_targets = 0;
   GtkTargetEntry* targets = gtk_target_table_new_from_list(target_list,
                                                            &num_targets);
   gtk_clipboard_set_with_data(clipboard, targets, num_targets,
                               SelectionClipboardGetContents, NULL,
                               shell_->webView());
   gtk_target_list_unref(target_list);
   gtk_target_table_free(targets, num_targets);
 }
 
-// Private methods -----------------------------------------------------------
+// Private methods ------------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
                        ("Test Shell - " + WideToUTF8(title)).c_str());
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
 }