Hook up WebViewClient, part 1....

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-2009 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 "config.h"
 #include "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "CSSStyleSelector.h"
@@ skipping 98 matching lines @@
 using WebKit::WebPoint;
 using WebKit::WebRect;
 using WebKit::WebSettings;
 using WebKit::WebSettingsImpl;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebTextDirection;
 using WebKit::WebTextDirectionDefault;
 using WebKit::WebTextDirectionLeftToRight;
 using WebKit::WebTextDirectionRightToLeft;
+using WebKit::WebURL;
 
 using webkit_glue::ImageResourceFetcher;
 
 // Change the text zoom level by kTextSizeMultiplierRatio each time the user
 // zooms text in or out (ie., change by 20%).  The min and max values limit
 // text zoom to half and 3x the original text size.  These three values match
 // those in Apple's port in WebKit/WebKit/WebView/WebView.mm
 static const double kTextSizeMultiplierRatio = 1.2;
 static const double kMinTextSizeMultiplier = 0.5;
 static const double kMaxTextSizeMultiplier = 3.0;
@@ skipping 321 matching lines @@
   main_frame()->frame()->eventHandler()->mouseMoved(
       PlatformMouseEventBuilder(main_frame()->frameview(), event));
 }
 
 void WebViewImpl::MouseLeave(const WebMouseEvent& event) {
   // This event gets sent as the main frame is closing.  In that case, just
   // ignore it.
   if (!main_frame() || !main_frame()->frameview())
     return;
 
-  delegate_->UpdateTargetURL(this, GURL());
+  client()->setMouseOverURL(WebURL());
 
   main_frame()->frame()->eventHandler()->handleMouseMoveEvent(
       PlatformMouseEventBuilder(main_frame()->frameview(), event));
 }
 
 void WebViewImpl::MouseDown(const WebMouseEvent& event) {
   if (!main_frame() || !main_frame()->frameview())
     return;
 
   last_mouse_down_point_ = gfx::Point(event.x, event.y);
@@ skipping 1336 matching lines @@
     *is_new_navigation = observed_new_navigation_;
 
 #ifndef NDEBUG
   DCHECK(!observed_new_navigation_ ||
     page_->mainFrame()->loader()->documentLoader() == new_navigation_loader_);
   new_navigation_loader_ = NULL;
 #endif
   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,
                                        const SkBitmap& image) {
   if (delegate_) {
     delegate_->DidDownloadImage(fetcher->id(), fetcher->image_url(),
                                 image.isNull(), image);
   }
   DeleteImageResourceFetcher(fetcher);
 }
@@ skipping 91 matching lines @@
       hitTestResultAtPoint(doc_point, false);
 }
 
 void WebViewImpl::SetSpellingPanelVisibility(bool is_visible) {
   spelling_panel_is_visible_ = is_visible;
 }
 
 bool WebViewImpl::GetSpellingPanelVisibility() {
   return spelling_panel_is_visible_;
 }