diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
| commit | dd7daa80d25deb78ab365e28df4d93437357793b (patch) | |
| tree | fb4dd2331820f5e32ddeb7e2bfb731f0604fbc0d /webkit/glue/dom_operations.cc | |
| parent | 64c40aa34646a198a04029ee6b78dd9559595dc5 (diff) | |
| download | chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.zip chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.gz chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.bz2 | |
Switch to WebFrame from the WebKit API.
I tried to avoid unnecessary changes in this CL to help make it easier to
review.
As part of this CL, glue/webtextinput* are folded into WebFrame / WebFrameImpl.
R=dglazkov
BUG=10034
TEST=none
Review URL: http://codereview.chromium.org/164225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_operations.cc')
| -rw-r--r-- | webkit/glue/dom_operations.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index 16f364a..c05cdf7 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -38,6 +38,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/webview_impl.h" using WebCore::String; +using WebKit::WebFrame; namespace { @@ -780,7 +781,7 @@ void GetApplicationInfo(WebView* view, WebApplicationInfo* app_info) { 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()) |