Switch to WebFrame from the WebKit API....

webkit/glue/dom_operations.cc

 // Copyright (c) 2006-2008 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 "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AnimationController.h"
@@ skipping 20 matching lines @@
 #include "base/string_util.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/password_autocomplete_listener.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 using WebCore::String;
+using WebKit::WebFrame;
 
 namespace {
 
 // Structure for storage the unique set of all savable resource links for
 // making sure that no duplicated resource link in final result. The consumer
 // of the SavableResourcesUniqueCheck is responsible for keeping these pointers
 // valid for the lifetime of the SavableResourcesUniqueCheck instance.
 struct SavableResourcesUniqueCheck {
   // Unique set of all sub resource links.
   std::set<GURL>* resources_set;
@@ skipping 722 matching lines @@
           CastHTMLElement<WebCore::HTMLMetaElement>(
               child, WebCore::HTMLNames::metaTag);
       if (meta) {
         if (meta->name() == String("application-name")) {
           app_info->title = webkit_glue::StringToStdWString(meta->content());
         } else if (meta->name() == String("description")) {
           app_info->description =
               webkit_glue::StringToStdWString(meta->content());
         } else if (meta->name() == String("application-url")) {
           std::string url = webkit_glue::StringToStdString(meta->content());
-          GURL main_url = main_frame->GetURL();
+          GURL main_url = main_frame->url();
           app_info->app_url = main_url.is_valid() ?
               main_url.Resolve(url) : GURL(url);
           if (!app_info->app_url.is_valid())
             app_info->app_url = GURL();
         }
       }
     }
   }
 }
 
@@ skipping 80 matching lines @@
   return static_cast<WebCore::HTMLInputElement*>(element);
 }
 
 WebCore::HTMLInputElement* NodeToHTMLInputElement(WebCore::Node* node) {
   if (node->nodeType() != WebCore::Node::ELEMENT_NODE)
     return NULL;
   return ElementToHTMLInputElement(static_cast<WebCore::Element*>(node));
 }
 
 } // webkit_glue