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/webplugin_impl.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/webplugin_impl.cc')
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index a04be97..b4e78d0 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -639,9 +639,10 @@ std::string WebPluginImpl::GetCookies(const GURL& url, const GURL& policy_url) { void WebPluginImpl::ShowModalHTMLDialog(const GURL& url, int width, int height, const std::string& json_arguments, std::string* json_retval) { - if (webframe_ && webframe_->GetView() && - webframe_->GetView()->GetDelegate()) { - webframe_->GetView()->GetDelegate()->ShowModalHTMLDialog( + if (webframe_ && + webframe_->GetWebViewImpl() && + webframe_->GetWebViewImpl()->GetDelegate()) { + webframe_->GetWebViewImpl()->GetDelegate()->ShowModalHTMLDialog( url, width, height, json_arguments, json_retval); } } @@ -1071,7 +1072,7 @@ void WebPluginImpl::didFinishLoading(WebURLLoader* loader) { delete (*index).second; multi_part_response_map_.erase(index); - WebView* web_view = webframe_->GetView(); + WebView* web_view = webframe_->GetWebViewImpl(); web_view->GetDelegate()->DidStopLoading(web_view); } loader->setDefersLoading(true); @@ -1333,7 +1334,7 @@ void WebPluginImpl::HandleHttpMultipartResponse( return; } - WebView* web_view = webframe_->GetView(); + WebView* web_view = webframe_->GetWebViewImpl(); web_view->GetDelegate()->DidStartLoading(web_view); MultiPartResponseClient* multi_part_response_client = |