Hook up WebViewClient, part 1....

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // 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.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #import <Cocoa/Cocoa.h>
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "webkit/api/public/WebCursorInfo.h"
+#include "webkit/api/public/WebPopupMenu.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webmenurunner_mac.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebNavigationPolicy;
+using WebKit::WebPopupMenu;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 using WebKit::WebWidget;
 
-// WebViewDelegate ------------------------------------------------------------
+// WebViewClient --------------------------------------------------------------
 
-WebWidget* TestWebViewDelegate::CreatePopupWidgetWithInfo(
-    WebView* webview,
+WebWidget* TestWebViewDelegate::createPopupMenu(
     const WebPopupMenuInfo& info) {
-  WebWidget* webwidget = shell_->CreatePopupWidget(webview);
+  WebWidget* webwidget = shell_->CreatePopupWidget();
   popup_menu_info_.reset(new WebPopupMenuInfo(info));
   return webwidget;
 }
 
-void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
-  NSString *text =
-      [NSString stringWithUTF8String:WideToUTF8(message).c_str()];
-  NSAlert *alert = [NSAlert alertWithMessageText:@"JavaScript Alert"
-                                   defaultButton:@"OK"
-                                 alternateButton:nil
-                                     otherButton:nil
-                       informativeTextWithFormat:text];
-  [alert runModal];
-}
-
 // WebWidgetClient ------------------------------------------------------------
 
 void TestWebViewDelegate::show(WebNavigationPolicy policy) {
   if (!popup_menu_info_.get())
     return;
   if (this != shell_->popup_delegate())
     return;
   // Display a HTML select menu.
 
   std::vector<WebMenuItem> items;
@@ skipping 153 matching lines @@
 }
 
 // Public methods -------------------------------------------------------------
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   // No selection clipboard on mac, do nothing.
 }
 
 // Private methods ------------------------------------------------------------
 
+void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
+  NSString *text =
+      [NSString stringWithUTF8String:WideToUTF8(message).c_str()];
+  NSAlert *alert = [NSAlert alertWithMessageText:@"JavaScript Alert"
+                                   defaultButton:@"OK"
+                                 alternateButton:nil
+                                     otherButton:nil
+                       informativeTextWithFormat:text];
+  [alert runModal];
+}
+
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(title).c_str()]];
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   const char* frameURL = url.spec().c_str();
   NSString *address = [NSString stringWithUTF8String:frameURL];
   [shell_->editWnd() setStringValue:address];
 }