Change the "Disable outdated plug-ins" lab to block them instead.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2736 matching lines @@
                                      &actual_mime_type));
 
   if (!found)
     return NULL;
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
   const PluginGroup* group =
       NPAPI::PluginList::Singleton()->GetPluginGroup(info);
   DCHECK(group != NULL);
 
-  if (!info.enabled) {
-    if (cmd->HasSwitch(switches::kDisableOutdatedPlugins) &&
-        group->IsVulnerable()) {
-      Send(new ViewHostMsg_DisabledOutdatedPlugin(routing_id_,
-                                                  group->GetGroupName(),
-                                                  GURL(group->GetUpdateURL())));
-      return CreateOutdatedPluginPlaceholder(frame, params, *group);
-    }
+  if (cmd->HasSwitch(switches::kDisableOutdatedPlugins) &&

[darin (slow to review), 2010/12/16 17:39:25]

i think you should rename the command line switch to kBlockOutdatedPlugins

[Bernhard Bauer, 2010/12/16 18:23:04]

Done.

+      group->IsVulnerable()) {
+    Send(new ViewHostMsg_DisabledOutdatedPlugin(routing_id_,

[darin (slow to review), 2010/12/16 17:39:25]

nit: change the IPC to BlockedOutdatedPlugin

[Bernhard Bauer, 2010/12/16 18:23:04]

Done.

+                                                group->GetGroupName(),
+                                                GURL(group->GetUpdateURL())));
+    return CreatePluginPlaceholder(frame,
+                                   params,
+                                   *group,
+                                   IDR_OUTDATED_PLUGIN_HTML,
+                                   IDS_PLUGIN_OUTDATED);
+  }
+  if (!info.enabled)
     return NULL;
-  }
 
   ContentSetting host_setting =
       current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS];
   if (info.path.value() == kDefaultPluginLibraryName ||
       plugin_setting == CONTENT_SETTING_ALLOW ||
       host_setting == CONTENT_SETTING_ALLOW) {
     scoped_refptr<pepper::PluginModule> pepper_module(
         pepper_delegate_.CreatePepperPlugin(info.path));
     if (pepper_module)
       return CreatePepperPlugin(frame, params, info.path, pepper_module.get());
     return CreateNPAPIPlugin(frame, params, info.path, actual_mime_type);
   }
   std::string resource;
   if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
     resource = group->identifier();
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
-  int resource_id;
-  int message_id;
   if (plugin_setting == CONTENT_SETTING_ASK) {
-    resource_id = IDR_BLOCKED_PLUGIN_HTML;
-    message_id = IDS_PLUGIN_LOAD;
+    return CreatePluginPlaceholder(frame,
+                                   params,
+                                   *group,
+                                   IDR_BLOCKED_PLUGIN_HTML,
+                                   IDS_PLUGIN_LOAD);
   } else {
-    resource_id = IDR_OUTDATED_PLUGIN_HTML;
-    message_id = IDS_PLUGIN_BLOCKED;
+    return CreatePluginPlaceholder(frame,
+                                   params,
+                                   *group,
+                                   IDR_OUTDATED_PLUGIN_HTML,
+                                   IDS_PLUGIN_BLOCKED);
   }
-  // |blocked_plugin| will delete itself when the WebViewPlugin
-  // is destroyed.
-  BlockedPlugin* blocked_plugin =
-      new BlockedPlugin(this,
-                        frame,
-                        *group,
-                        params,
-                        webkit_preferences_,
-                        resource_id,
-                        l10n_util::GetStringUTF16(message_id));
-  return blocked_plugin->plugin();
 }
 
 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) {
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
   int appcache_host_id = appcache_host ? appcache_host->host_id() : 0;
   return new WebWorkerProxy(client, RenderThread::current(), routing_id_,
                             appcache_host_id);
 }
 
@@ skipping 1611 matching lines @@
 }
 
 WebPlugin* RenderView::CreateNPAPIPlugin(WebFrame* frame,
                                          const WebPluginParams& params,
                                          const FilePath& path,
                                          const std::string& mime_type) {
   return new webkit_glue::WebPluginImpl(
       frame, params, path, mime_type, AsWeakPtr());
 }
 
-WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
+WebPlugin* RenderView::CreatePluginPlaceholder(
     WebFrame* frame,
     const WebPluginParams& params,
-    const PluginGroup& group) {
-  int resource_id = IDR_OUTDATED_PLUGIN_HTML;
-  const base::StringPiece template_html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
-
-  DCHECK(!template_html.empty()) << "unable to load template. ID: "
-                                 << resource_id;
-
-  DictionaryValue values;
-  values.SetString("message",
-      l10n_util::GetStringFUTF8(IDS_PLUGIN_OUTDATED, group.GetGroupName()));
-  values.Set("pluginGroup", group.GetDataForUI());
-
-  // "t" is the id of the templates root node.
-  std::string htmlData = jstemplate_builder::GetTemplatesHtml(
-      template_html, &values, "t");
-
-  return WebViewPlugin::Create(NULL,
-                               webkit_preferences_,
-                               htmlData,
-                               GURL("chrome://outdatedplugin/"));
+    const PluginGroup& group,
+    int resource_id,
+    int message_id) {
+  // |blocked_plugin| will delete itself when the WebViewPlugin
+  // is destroyed.
+  BlockedPlugin* blocked_plugin =
+      new BlockedPlugin(this,
+                        frame,
+                        group,
+                        params,
+                        webkit_preferences_,
+                        resource_id,
+                        l10n_util::GetStringUTF16(message_id));
+  return blocked_plugin->plugin();
 }
 
 void RenderView::OnZoom(PageZoom::Function function) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
 
   double old_zoom_level = webview()->zoomLevel();
   double zoom_level;
@@ skipping 1278 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }