Hook up WebViewClient, part 1....

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 18 matching lines @@
 #include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
+using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
+using WebKit::WebWidget;
 
 namespace {
 
 enum SelectionClipboardType {
   TEXT_HTML,
   PLAIN_TEXT,
 };
 
 GdkAtom GetTextHtmlAtom() {
   GdkAtom kTextHtmlGdkAtom = gdk_atom_intern_static_string("text/html");
@@ skipping 25 matching lines @@
                            reinterpret_cast<const guchar*>(selection.data()),
                            selection.length());
   } else {
     gtk_selection_data_set_text(selection_data, selection.data(),
         selection.length());
   }
 }
 
 }  // namespace
 
-// WebViewDelegate ------------------------------------------------------------
+// WebViewClient --------------------------------------------------------------
 
-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);
+WebWidget* TestWebViewDelegate::createPopupMenu(
+    const WebPopupMenuInfo& info) {
+  NOTREACHED();
+  return NULL;
 }
 
 // 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);
@@ skipping 150 matching lines @@
                                                            &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 ------------------------------------------------------------
 
+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);
+}
+
 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());
 }