Switch to WebFrame from the WebKit API....

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 26 matching lines @@
 #include "webkit/api/public/WebForm.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLError.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/api/src/WrappedResourceRequest.h"
 #include "webkit/api/src/WrappedResourceResponse.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
+#include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview_impl.h"
 
 using namespace WebCore;
 
 using base::Time;
@@ skipping 424 matching lines @@
 }
 
 void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const KURL& url,
                                                              double interval,
                                                              double fire_date) {
   // Tells dispatchDidStartProvisionalLoad that if it sees this item it is a
   // redirect and the source item should be added as the start of the chain.
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview ? webview->delegate() : NULL;
   if (d) {
-    expected_client_redirect_src_ = webframe_->GetURL();
+    expected_client_redirect_src_ = webframe_->url();
     expected_client_redirect_dest_ = webkit_glue::KURLToGURL(url);
 
     // TODO(timsteele): bug 1135512. Webkit does not properly notify us of
     // cancelling http > file client redirects. Since the FrameLoader's policy
     // is to never carry out such a navigation anyway, the best thing we can do
     // for now to not get confused is ignore this notification.
     if (expected_client_redirect_dest_.SchemeIsFile() &&
        (expected_client_redirect_src_.SchemeIs("http") ||
         expected_client_redirect_src_.SchemeIsSecure())) {
       expected_client_redirect_src_ = GURL();
@@ skipping 744 matching lines @@
   GURL gurl = webkit_glue::KURLToGURL(url);
   std::string my_mime_type =
       webkit_glue::CStringToStdString(mime_type.latin1());
   StringToLowerASCII(&my_mime_type);
 
   // Get the classid and version from attributes of the object.
   std::string combined_clsid;
 #if defined(OS_WIN)
   std::string clsid, version;
   if (activex_shim::IsMimeTypeActiveX(my_mime_type)) {
-    GURL url = webframe_->GetURL();
+    GURL url = webframe_->url();
     for (unsigned int i = 0; i < param_names.size(); i++) {
       String lowercase_param_name = param_names[i].lower();
       if (lowercase_param_name == "classid") {
         activex_shim::GetClsidFromClassidAttribute(
             webkit_glue::CStringToStdString(param_values[i].latin1()), &clsid);
       } else if (lowercase_param_name == "codebase") {
         version = activex_shim::GetVersionFromCodebaseAttribute(
             webkit_glue::CStringToStdString(param_values[i].latin1()));
       }
     }
@@ skipping 156 matching lines @@
 
   std::string offset_str = url.ExtractFileName();
   int offset;
   if (!StringToInt(offset_str, &offset))
     return;
 
   WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
   if (d)
     d->NavigateBackForwardSoon(offset);
 }