Fix Linux breakage of context menu items for the blocked plugin placeholder....

chrome/renderer/blocked_plugin.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/blocked_plugin.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
@@ skipping 23 matching lines @@
 using WebKit::WebNode;
 using WebKit::WebPlugin;
 using WebKit::WebPluginContainer;
 using WebKit::WebPluginParams;
 using WebKit::WebPoint;
 using WebKit::WebRegularExpression;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 static const char* const kBlockedPluginDataURL = "chrome://blockedplugindata/";
+// 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;
 
 BlockedPlugin::BlockedPlugin(RenderView* render_view,
                              WebFrame* frame,
                              const webkit::npapi::PluginGroup& info,
                              const WebPluginParams& params,
                              const WebPreferences& preferences,
                              int template_id,
                              const string16& message)
     : RenderViewObserver(render_view),
       frame_(frame),
-      plugin_params_(params),
-      custom_menu_showing_(false) {
+      plugin_params_(params) {
   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_);
@@ skipping 43 matching lines @@
   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());
   custom_items[3] = hide_item;
 
   menu_data.customItems.swap(custom_items);
   menu_data.mousePosition = WebPoint(event.windowX, event.windowY);
   render_view()->showContextMenu(NULL, menu_data);
-  custom_menu_showing_ = true;
 }
 
 bool BlockedPlugin::OnMessageReceived(const IPC::Message& message) {
-  if (custom_menu_showing_ &&
-      message.type() == ViewMsg_CustomContextMenuAction::ID) {
+  // We don't swallow ViewMsg_CustomContextMenuAction because we listen for all
+  // custom menu IDs, and not just our own. We don't swallow
+  // ViewMsg_LoadBlockedPlugins because multiple blocked plugins have an
+  // interest in it.
+  if (message.type() == ViewMsg_CustomContextMenuAction::ID) {
     ViewMsg_CustomContextMenuAction::Dispatch(
         &message, this, this, &BlockedPlugin::OnMenuItemSelected);
-    return true;
-  }
-
-  // Don't want to swallow these messages.
-  if (message.type() == ViewMsg_LoadBlockedPlugins::ID) {
+  } else if (message.type() == ViewMsg_LoadBlockedPlugins::ID) {
     LoadPlugin();
-  } else if (message.type() == ViewMsg_ContextMenuClosed::ID) {
-    custom_menu_showing_ = false;
   }
 
   return false;
 }
 
 void BlockedPlugin::OnMenuItemSelected(unsigned id) {
   if (id == kMenuActionLoad) {
     LoadPlugin();
   } else if (id == kMenuActionRemove) {
     HidePlugin();
-  } else {
-    NOTREACHED();
   }
 }
 
 void BlockedPlugin::LoadPlugin() {
   CHECK(plugin_);
   WebPluginContainer* container = plugin_->container();
   WebPlugin* new_plugin =
       render_view()->CreatePluginNoCheck(frame_, plugin_params_);
   if (new_plugin && new_plugin->initialize(container)) {
     container->setPlugin(new_plugin);
@@ skipping 55 matching lines @@
       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;");
       }
     }
   }
 }