summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-01 14:49:01 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-01 14:49:01 +0000
commit6ac77cba804aeb102dcc636bed567c3bb7b48f5e (patch)
tree1071173db6b16e5fdff97c21823bb05a06668959 /content/shell
parenta7fb2513ba11ff13b20614f86bd372846a10dd2f (diff)
downloadchromium_src-6ac77cba804aeb102dcc636bed567c3bb7b48f5e.zip
chromium_src-6ac77cba804aeb102dcc636bed567c3bb7b48f5e.tar.gz
chromium_src-6ac77cba804aeb102dcc636bed567c3bb7b48f5e.tar.bz2
Show a replacement plug-in for loading errors.
This allows us to show a nicer placeholder when loading a plug-in fails then the one coming from WebKit. BUG=123580 TEST=manual Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=134620 Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=134630 Review URL: http://codereview.chromium.org/10093011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_renderer_client.cc6
-rw-r--r--content/shell/shell_content_renderer_client.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index 2bcb24e..ed789b1 100644
--- a/content/shell/shell_content_renderer_client.cc
+++ b/content/shell/shell_content_renderer_client.cc
@@ -43,6 +43,12 @@ bool ShellContentRendererClient::OverrideCreatePlugin(
return false;
}
+WebKit::WebPlugin* ShellContentRendererClient::CreatePluginReplacement(
+ RenderView* render_view,
+ const FilePath& plugin_path) {
+ return NULL;
+}
+
bool ShellContentRendererClient::HasErrorPage(int http_status_code,
std::string* error_domain) {
return false;
diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h
index a28f4f0..06828ab 100644
--- a/content/shell/shell_content_renderer_client.h
+++ b/content/shell/shell_content_renderer_client.h
@@ -28,6 +28,9 @@ class ShellContentRendererClient : public ContentRendererClient {
WebKit::WebFrame* frame,
const WebKit::WebPluginParams& params,
WebKit::WebPlugin** plugin) OVERRIDE;
+ virtual WebKit::WebPlugin* CreatePluginReplacement(
+ RenderView* render_view,
+ const FilePath& plugin_path) OVERRIDE;
virtual bool HasErrorPage(int http_status_code,
std::string* error_domain) OVERRIDE;
virtual void GetNavigationErrorStrings(