Use a placeholder instead of the default plugin for missing plug-ins on Mac and Linux.

chrome/renderer/blocked_plugin.cc

 // Copyright (c) 2011 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/blocked_plugin.h"
 
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/common/jstemplate_builder.h"
@@ skipping 38 matching lines @@
 // TODO(cevans) - move these to a shared header file so that there are no
 // collisions in the longer term. Currently, blocked_plugin.cc is the only
 // user of custom menu commands (extension menu items have their own range).
 static const unsigned kMenuActionLoad = 1;
 static const unsigned kMenuActionRemove = 2;
 
 static const BlockedPlugin* g_last_active_menu;
 
 BlockedPlugin::BlockedPlugin(RenderView* render_view,
                              WebFrame* frame,
-                             const webkit::npapi::PluginGroup& info,
                              const WebPluginParams& params,
                              const WebPreferences& preferences,
                              int template_id,
+                             const string16& name,
                              const string16& message,
                              bool is_blocked_for_prerendering,
                              bool allow_loading)
     : RenderViewObserver(render_view),
       frame_(frame),
       plugin_params_(params),
+      name_(name),
       is_blocked_for_prerendering_(is_blocked_for_prerendering),
       hidden_(false),
       allow_loading_(allow_loading) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
 
   DCHECK(!template_html.empty()) << "unable to load template. ID: "
                                  << template_id;
 
   DictionaryValue values;
   values.SetString("message", message);
-  name_ = info.GetGroupName();
   values.SetString("name", name_);
   values.SetString("hide", l10n_util::GetStringUTF8(IDS_PLUGIN_HIDE));
 
   // "t" is the id of the templates root node.
   std::string html_data = jstemplate_builder::GetTemplatesHtml(
       template_html, &values, "t");
 
   plugin_ = webkit::npapi::WebViewPlugin::Create(this,
                                                  preferences,
                                                  html_data,
                                                  GURL(kBlockedPluginDataURL));
 }
 
 BlockedPlugin::~BlockedPlugin() {
 }
 
 void BlockedPlugin::BindWebFrame(WebFrame* frame) {
   BindToJavascript(frame, "plugin");
   BindMethod("load", &BlockedPlugin::Load);
   BindMethod("hide", &BlockedPlugin::Hide);
 }
 
 void BlockedPlugin::WillDestroyPlugin() {
   delete this;
 }
 
 void BlockedPlugin::ShowContextMenu(const WebKit::WebMouseEvent& event) {
   WebContextMenuData menu_data;
-  WebVector<WebMenuItemInfo> custom_items(static_cast<size_t>(4));
 
-  WebMenuItemInfo name_item;
-  name_item.label = name_;
-  name_item.hasTextDirectionOverride = false;
-  name_item.textDirection =  WebKit::WebTextDirectionDefault;
-  custom_items[0] = name_item;
+  size_t num_items = name_.empty() ? 2u : 4u;
+  WebVector<WebMenuItemInfo> custom_items(num_items);
 
-  WebMenuItemInfo separator_item;
-  separator_item.type = WebMenuItemInfo::Separator;
-  custom_items[1] = separator_item;
+  size_t i = 0;
+  if (!name_.empty()) {
+    WebMenuItemInfo name_item;
+    name_item.label = name_;
+    name_item.hasTextDirectionOverride = false;
+    name_item.textDirection =  WebKit::WebTextDirectionDefault;
+    custom_items[i++] = name_item;
+
+    WebMenuItemInfo separator_item;
+    separator_item.type = WebMenuItemInfo::Separator;
+    custom_items[i++] = separator_item;
+  }
 
   WebMenuItemInfo run_item;
   run_item.action = kMenuActionLoad;
   // Disable this menu item if the plugin is blocked by policy.
   run_item.enabled = allow_loading_;
   run_item.label = WebString::fromUTF8(
       l10n_util::GetStringUTF8(IDS_CONTENT_CONTEXT_PLUGIN_RUN).c_str());
   run_item.hasTextDirectionOverride = false;
   run_item.textDirection =  WebKit::WebTextDirectionDefault;
-  custom_items[2] = run_item;
+  custom_items[i++] = run_item;
 
   WebMenuItemInfo hide_item;
   hide_item.action = kMenuActionRemove;
   hide_item.enabled = true;
   hide_item.label = WebString::fromUTF8(
       l10n_util::GetStringUTF8(IDS_CONTENT_CONTEXT_PLUGIN_HIDE).c_str());
   hide_item.hasTextDirectionOverride = false;
   hide_item.textDirection =  WebKit::WebTextDirectionDefault;
-  custom_items[3] = hide_item;
+  custom_items[i++] = hide_item;
 
   menu_data.customItems.swap(custom_items);
   menu_data.mousePosition = WebPoint(event.windowX, event.windowY);
   render_view()->showContextMenu(NULL, menu_data);
   g_last_active_menu = this;
 }
 
 bool BlockedPlugin::OnMessageReceived(const IPC::Message& message) {
   // We don't swallow ViewMsg_CustomContextMenuAction because we listen for all
   // custom menu IDs, and not just our own. We don't swallow
@@ skipping 110 matching lines @@
       element = parent.toConst<WebElement>();
       if (element.hasAttribute("style")) {
         WebString style_str = element.getAttribute("style");
         if (width_regex.match(style_str) >= 0 &&
             height_regex.match(style_str) >= 0)
           element.setAttribute("style", "display: none;");
       }
     }
   }
 }