| Index: chrome/renderer/render_view.cc
|
| diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
|
| index 2c50d8ee0e7a6b42a19cdc19e88c02ea37959ffc..dbb67343a8ba784e1b3e503d90cc24dd59b21933 100644
|
| --- a/chrome/renderer/render_view.cc
|
| +++ b/chrome/renderer/render_view.cc
|
| @@ -2773,8 +2773,8 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
|
| NPAPI::PluginList::Singleton()->GetPluginGroup(info);
|
| DCHECK(group != NULL);
|
|
|
| - if (cmd->HasSwitch(switches::kBlockOutdatedPlugins) &&
|
| - group->IsVulnerable()) {
|
| + if (group->IsVulnerable() &&
|
| + !cmd->HasSwitch(switches::kAllowOutdatedPlugins)) {
|
| Send(new ViewHostMsg_BlockedOutdatedPlugin(routing_id_,
|
| group->GetGroupName(),
|
| GURL(group->GetUpdateURL())));
|
| @@ -2784,6 +2784,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
|
| IDR_BLOCKED_PLUGIN_HTML,
|
| IDS_PLUGIN_OUTDATED);
|
| }
|
| +
|
| if (!info.enabled)
|
| return NULL;
|
|
|
|
|