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, 8 insertions, 7 deletions

diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index e708327..38d4f94 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -116,6 +116,7 @@ using WebKit::WebTextDirection;
 using WebKit::WebTextDirectionDefault;
 using WebKit::WebTextDirectionLeftToRight;
 using WebKit::WebTextDirectionRightToLeft;
+using WebKit::WebURL;
 
 using webkit_glue::ImageResourceFetcher;
 
@@ -457,7 +458,7 @@ void WebViewImpl::MouseLeave(const WebMouseEvent& event) {
   if (!main_frame() || !main_frame()->frameview())
     return;
 
-  delegate_->UpdateTargetURL(this, GURL());
+  client()->setMouseOverURL(WebURL());
 
   main_frame()->frame()->eventHandler()->handleMouseMoveEvent(
       PlatformMouseEventBuilder(main_frame()->frameview(), event));
@@ -1814,14 +1815,14 @@ void WebViewImpl::DidCommitLoad(bool* is_new_navigation) {
   observed_new_navigation_ = false;
 }
 
-void WebViewImpl::StartDragging(WebPoint event_pos,
+void WebViewImpl::StartDragging(const WebPoint& event_pos,
                                 const WebDragData& drag_data,
                                 WebDragOperationsMask mask) {
-  if (delegate_) {
-    DCHECK(!doing_drag_and_drop_);
-    doing_drag_and_drop_ = true;
-    delegate_->StartDragging(this, event_pos, drag_data, mask);
-  }
+  if (!client())
+    return;
+  DCHECK(!doing_drag_and_drop_);
+  doing_drag_and_drop_ = true;
+  client()->startDragging(event_pos, drag_data, mask);
 }
 
 void WebViewImpl::OnImageFetchComplete(ImageResourceFetcher* fetcher,