summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 17:51:26 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 17:51:26 +0000
commit20532328921c20eeb6c49a8921bca8b044d73791 (patch)
treeb352ad4ba44900e3b991a3eeed05c887564fda15 /webkit
parentce20f1534bf4396377f000b1e631151950d5fdac (diff)
downloadchromium_src-20532328921c20eeb6c49a8921bca8b044d73791.zip
chromium_src-20532328921c20eeb6c49a8921bca8b044d73791.tar.gz
chromium_src-20532328921c20eeb6c49a8921bca8b044d73791.tar.bz2
Implement WebFrameClient::didReceiveResponse in WebViewPlugin
BUG=72150 TEST=no clang warning Review URL: http://codereview.chromium.org/6312183 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/webview_plugin.cc6
-rw-r--r--webkit/plugins/npapi/webview_plugin.h8
2 files changed, 14 insertions, 0 deletions
diff --git a/webkit/plugins/npapi/webview_plugin.cc b/webkit/plugins/npapi/webview_plugin.cc
index 6937ce4..b2b923e 100644
--- a/webkit/plugins/npapi/webview_plugin.cc
+++ b/webkit/plugins/npapi/webview_plugin.cc
@@ -237,5 +237,11 @@ WebURLError WebViewPlugin::cancelledError(WebFrame* frame,
return error;
}
+void WebViewPlugin::didReceiveResponse(WebFrame* frame,
+ unsigned identifier,
+ const WebURLResponse& response) {
+ WebFrameClient::didReceiveResponse(frame, identifier, response);
+}
+
} // namespace npapi
} // namespace webkit
diff --git a/webkit/plugins/npapi/webview_plugin.h b/webkit/plugins/npapi/webview_plugin.h
index fcdefd9..b9e2b62 100644
--- a/webkit/plugins/npapi/webview_plugin.h
+++ b/webkit/plugins/npapi/webview_plugin.h
@@ -125,6 +125,14 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
virtual WebKit::WebURLError cancelledError(
WebKit::WebFrame* frame, const WebKit::WebURLRequest& request);
+ // This method is defined in WebPlugin as well as in WebFrameClient, but with
+ // different parameters. We only care about implementing the WebPlugin
+ // version, so we implement this method and call the default in WebFrameClient
+ // (which does nothing) to correctly overload it.
+ virtual void didReceiveResponse(WebKit::WebFrame* frame,
+ unsigned identifier,
+ const WebKit::WebURLResponse& response);
+
private:
friend class DeleteTask<WebViewPlugin>;
virtual ~WebViewPlugin();