Hook up WebViewClient, part 1.

This change makes WebViewDelegate extend from WebViewClient as
a temporary means to start having consumers implement and use
WebViewClient.

R=dglazkov
BUG=10033
TEST=none

Review URL: http://codereview.chromium.org/196128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26355 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 15 deletions

diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm
index 97c1280..369eaa4 100644
--- a/webkit/tools/test_shell/mac/test_webview_delegate.mm
+++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm
@@ -8,6 +8,7 @@
 #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"
@@ -17,31 +18,20 @@
 
 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) {
@@ -215,6 +205,17 @@ void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
 
 // 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()]];