diff options
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 8 | ||||
-rw-r--r-- | chrome/renderer/chrome_content_renderer_client.h | 3 | ||||
-rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.cc | 24 | ||||
-rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.h | 6 |
4 files changed, 1 insertions, 40 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 46473c3..12ae141 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -295,14 +295,6 @@ bool ChromeContentRendererClient::OverrideCreatePlugin( return true; } -WebPlugin* ChromeContentRendererClient::CreatePluginReplacement( - content::RenderView* render_view, - const FilePath& plugin_path) { - PluginPlaceholder* placeholder = - PluginPlaceholder::CreateErrorPlugin(render_view, plugin_path); - return placeholder->plugin(); -} - webkit_media::WebMediaPlayerImpl* ChromeContentRendererClient::OverrideCreateWebMediaPlayer( content::RenderView* render_view, diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index c587e70..c18d866 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -58,9 +58,6 @@ class ChromeContentRendererClient : public content::ContentRendererClient { WebKit::WebFrame* frame, const WebKit::WebPluginParams& params, WebKit::WebPlugin** plugin) OVERRIDE; - virtual WebKit::WebPlugin* CreatePluginReplacement( - content::RenderView* render_view, - const FilePath& plugin_path) OVERRIDE; virtual bool HasErrorPage(int http_status_code, std::string* error_domain) OVERRIDE; virtual void GetNavigationErrorStrings( diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index 595bb98..c0a09a9 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -21,7 +21,6 @@ #include "content/public/renderer/render_view.h" #include "grit/generated_resources.h" #include "grit/renderer_resources.h" -#include "grit/webkit_strings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" @@ -40,7 +39,6 @@ #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_group.h" -#include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/webview_plugin.h" using content::RenderThread; @@ -99,28 +97,6 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin( return missing_plugin; } -PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin( - RenderView* render_view, - const FilePath& file_path) { - DictionaryValue values; - values.SetString("message", - l10n_util::GetStringUTF8(IDS_PLUGIN_INITIALIZATION_ERROR)); - - const base::StringPiece template_html( - ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_BLOCKED_PLUGIN_HTML)); - std::string html_data = - jstemplate_builder::GetI18nTemplateHtml(template_html, &values); - - WebPluginParams params; - // |missing_plugin| will destroy itself when its WebViewPlugin is going away. - PluginPlaceholder* plugin = new PluginPlaceholder( - render_view, NULL, params, html_data, params.mimeType); - plugin->set_allow_loading(true); - - return plugin; -} - // static PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin( RenderView* render_view, diff --git a/chrome/renderer/plugins/plugin_placeholder.h b/chrome/renderer/plugins/plugin_placeholder.h index 6275284..eb70d35 100644 --- a/chrome/renderer/plugins/plugin_placeholder.h +++ b/chrome/renderer/plugins/plugin_placeholder.h @@ -16,10 +16,10 @@ struct ChromeViewHostMsg_GetPluginInfo_Status; namespace webkit { +struct WebPluginInfo; namespace npapi { class PluginGroup; } -struct WebPluginInfo; } // Placeholders can be used if a plug-in is missing or not available @@ -35,10 +35,6 @@ class PluginPlaceholder : public content::RenderViewObserver, WebKit::WebFrame* frame, const WebKit::WebPluginParams& params); - static PluginPlaceholder* CreateErrorPlugin( - content::RenderView* render_view, - const FilePath& plugin_path); - static PluginPlaceholder* CreateBlockedPlugin( content::RenderView* render_view, WebKit::WebFrame* frame, |