Oops, fix my previous fix to the refactor breakage. Make sure we only apply...

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 "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 29 matching lines @@
 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;
 
+static const BlockedPlugin* gLastActiveMenu;
+
 BlockedPlugin::BlockedPlugin(RenderView* render_view,
                              WebFrame* frame,
                              const webkit::npapi::PluginGroup& info,
                              const WebPluginParams& params,
                              const WebPreferences& preferences,
                              int template_id,
                              const string16& message,
                              bool is_blocked_for_prerendering)
     : RenderViewObserver(render_view),
       frame_(frame),
@@ skipping 55 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);
+  gLastActiveMenu = 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
   // ViewMsg_LoadBlockedPlugins because multiple blocked plugins have an
   // interest in it.
-  if (message.type() == ViewMsg_CustomContextMenuAction::ID) {
+  if (message.type() == ViewMsg_CustomContextMenuAction::ID &&
+      gLastActiveMenu == this) {
     ViewMsg_CustomContextMenuAction::Dispatch(
         &message, this, this, &BlockedPlugin::OnMenuItemSelected);
   } else if (message.type() == ViewMsg_LoadBlockedPlugins::ID) {
     LoadPlugin();
   } else if (message.type() == ViewMsg_DisplayPrerenderedPage::ID) {
     if (is_blocked_for_prerendering_)
       LoadPlugin();
   }
 
   return false;
@@ skipping 72 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;");
       }
     }
   }
 }