Hook up WebViewClient, part 1....

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-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 <string>
 #include <vector>
 
 #include "Chrome.h"
@@ skipping 486 matching lines @@
         expected_client_redirect_dest_,
         static_cast<unsigned int>(interval),
         static_cast<unsigned int>(fire_date));
   }
 }
 
 void WebFrameLoaderClient::dispatchDidChangeLocationWithinPage() {
   // Anchor fragment navigations are not normal loads, so we need to synthesize
   // some events for our delegate.
   WebViewImpl* webview = webframe_->GetWebViewImpl();
-  WebViewDelegate* d = webview->delegate();
-  if (d)
-    d->DidStartLoading(webview);
+  if (webview->client())
+    webview->client()->didStartLoading();
 
   WebDataSourceImpl* ds = webframe_->GetDataSourceImpl();
   DCHECK(ds) << "DataSource NULL when navigating to reference fragment";
   if (ds) {
     GURL url = ds->request().url();
     GURL chain_end = ds->endOfRedirectChain();
     ds->clearRedirectChain();
 
     // Figure out if this location change is because of a JS-initiated client
     // redirect (e.g onload/setTimeout document.location.href=).
@@ skipping 23 matching lines @@
     ds->appendRedirect(url);
   }
 
   bool is_new_navigation;
   webview->DidCommitLoad(&is_new_navigation);
   if (webframe_->client()) {
     webframe_->client()->didChangeLocationWithinPage(
         webframe_, is_new_navigation);
   }
 
-  if (d)
-    d->DidStopLoading(webview);
+  if (webview->client())
+    webview->client()->didStopLoading();
 }
 
 void WebFrameLoaderClient::dispatchWillClose() {
   if (webframe_->client())
     webframe_->client()->willClose(webframe_);
 }
 
 void WebFrameLoaderClient::dispatchDidReceiveIcon() {
   // The icon database is disabled, so this should never be called.
   ASSERT_NOT_REACHED();
@@ skipping 313 matching lines @@
   if (plugin_widget_.get()) {
     if (sent_initial_response_to_plugin_) {
       plugin_widget_->didFailLoading(error);
       sent_initial_response_to_plugin_ = false;
     }
     plugin_widget_ = NULL;
   }
 }
 
 void WebFrameLoaderClient::postProgressStartedNotification() {
-  if (hasWebView()) {
-    WebViewImpl* web_view = webframe_->GetWebViewImpl();
-    WebViewDelegate* d = web_view->delegate();
-    if (d)
-      d->DidStartLoading(web_view);
-  }
+  WebViewImpl* webview = webframe_->GetWebViewImpl();
+  if (webview && webview->client())
+    webview->client()->didStartLoading();
 }
 
 void WebFrameLoaderClient::postProgressEstimateChangedNotification() {
   // FIXME
 }
 
 void WebFrameLoaderClient::postProgressFinishedNotification() {
-  // TODO(ericroman): why might webframe_->webview_impl be null?
+  // TODO(ericroman): why might the webview be null?
   // http://b/1234461
-  if (hasWebView()) {
-    WebViewImpl* web_view = webframe_->GetWebViewImpl();
-    WebViewDelegate* d = web_view->delegate();
-    if (d)
-      d->DidStopLoading(web_view);
-  }
+  WebViewImpl* webview = webframe_->GetWebViewImpl();
+  if (webview && webview->client())
+    webview->client()->didStopLoading();
 }
 
 void WebFrameLoaderClient::setMainFrameDocumentReady(bool ready) {
   // FIXME
 }
 
 // Creates a new connection and begins downloading from that (contrast this
 // with |download|).
 void WebFrameLoaderClient::startDownload(const ResourceRequest& request) {
   if (webframe_->client()) {
@@ skipping 409 matching lines @@
 }
 
 void WebFrameLoaderClient::HandleBackForwardNavigation(const GURL& url) {
   DCHECK(url.SchemeIs(webkit_glue::kBackForwardNavigationScheme));
 
   std::string offset_str = url.ExtractFileName();
   int offset;
   if (!StringToInt(offset_str, &offset))
     return;
 
-  WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
-  if (d)
-    d->NavigateBackForwardSoon(offset);
+  WebViewImpl* webview = webframe_->GetWebViewImpl();
+  if (webview->client())
+    webview->client()->navigateBackForwardSoon(offset);
 }
 
 PassOwnPtr<WebPluginLoadObserver> WebFrameLoaderClient::GetPluginLoadObserver() {
   WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(
       webframe_->frame()->loader()->activeDocumentLoader());
   return ds->releasePluginLoadObserver();
 }