diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 13:32:29 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 13:32:29 +0000 |
| commit | 851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c (patch) | |
| tree | a409d4ec9b6804999d0ea4bf25750d6e896f90ba /chrome/renderer/blocked_plugin.cc | |
| parent | b089b89cabbb56d499dcbe2ee070e20710d362ef (diff) | |
| download | chromium_src-851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c.zip chromium_src-851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c.tar.gz chromium_src-851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c.tar.bz2 | |
Disable outdated non-sandboxed plugins.
Relanding r55227, which had a compile error.
BUG=47731
TEST=Run with --disable-outdated-plugins
Review URL: http://codereview.chromium.org/3071028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/blocked_plugin.cc')
| -rw-r--r-- | chrome/renderer/blocked_plugin.cc | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index c6433c3..b3c0973 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -10,6 +10,7 @@ #include "base/string_piece.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/notification_service.h" +#include "chrome/common/plugin_group.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" @@ -33,7 +34,8 @@ static const char* const kBlockedPluginDataURL = "chrome://blockedplugindata/"; BlockedPlugin::BlockedPlugin(RenderView* render_view, WebFrame* frame, - const WebPluginParams& params) + const WebPluginParams& params, + PluginGroup* group) : render_view_(render_view), frame_(frame), plugin_params_(params) { @@ -49,15 +51,19 @@ BlockedPlugin::BlockedPlugin(RenderView* render_view, DCHECK(!template_html.empty()) << "unable to load template. ID: " << resource_id; - DictionaryValue localized_strings; - localized_strings.SetString(L"loadPlugin", + DictionaryValue values; + values.SetString(L"loadPlugin", l10n_util::GetStringUTF16(IDS_PLUGIN_LOAD)); - localized_strings.SetString(L"message", + values.SetString(L"updatePlugin", + l10n_util::GetStringUTF16(IDS_PLUGIN_UPDATE)); + values.SetString(L"message", l10n_util::GetStringUTF16(IDS_BLOCKED_PLUGINS_TITLE)); + if (group) + values.Set(L"pluginGroup", group->GetDataForUI()); // "t" is the id of the templates root node. std::string htmlData = jstemplate_builder::GetTemplatesHtml( - template_html, &localized_strings, "t"); + template_html, &values, "t"); web_view->mainFrame()->loadHTMLString(htmlData, GURL(kBlockedPluginDataURL)); @@ -70,6 +76,7 @@ BlockedPlugin::BlockedPlugin(RenderView* render_view, void BlockedPlugin::BindWebFrame(WebFrame* frame) { BindToJavascript(frame, L"plugin"); BindMethod("load", &BlockedPlugin::Load); + BindMethod("update", &BlockedPlugin::Update); } void BlockedPlugin::WillDestroyPlugin() { @@ -90,6 +97,23 @@ void BlockedPlugin::Load(const CppArgumentList& args, CppVariant* result) { LoadPlugin(); } +void BlockedPlugin::Update(const CppArgumentList& args, CppVariant* result) { + if (args.size() > 0) { + CppVariant arg(args[0]); + if (arg.isString()) { + GURL url(arg.ToString()); + OpenURL(url); + } + } +} + +void BlockedPlugin::OpenURL(GURL& url) { + render_view_->Send(new ViewHostMsg_OpenURL(render_view_->routing_id(), + url, + GURL(), + CURRENT_TAB)); +} + void BlockedPlugin::LoadPlugin() { CHECK(plugin_); WebPluginContainer* container = plugin_->container(); |