Add hide icon on the click-to-play UI too.

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 "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/common/jstemplate_builder.h"
@@ skipping 42 matching lines @@
                              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),
       plugin_params_(params),
-      is_blocked_for_prerendering_(is_blocked_for_prerendering) {
+      is_blocked_for_prerendering_(is_blocked_for_prerendering),
+      hidden_(false) {
   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 75 matching lines @@
 void BlockedPlugin::OnMenuItemSelected(unsigned id) {
   if (id == kMenuActionLoad) {
     LoadPlugin();
   } else if (id == kMenuActionRemove) {
     HidePlugin();
   }
 }
 
 void BlockedPlugin::LoadPlugin() {
   CHECK(plugin_);
+  // This is not strictly necessary but is an important defense in case the
+  // event propagation changes between "close" vs. "click-to-play".
+  if (hidden_)
+    return;
   WebPluginContainer* container = plugin_->container();
   WebPlugin* new_plugin =
       render_view()->CreatePluginNoCheck(frame_, plugin_params_);
   if (new_plugin && new_plugin->initialize(container)) {
     container->setPlugin(new_plugin);
     container->invalidate();
     container->reportGeometry();
     plugin_->ReplayReceivedData(new_plugin);
     plugin_->destroy();
   }
 }
 
 void BlockedPlugin::Load(const CppArgumentList& args, CppVariant* result) {
   LoadPlugin();
 }
 
 void BlockedPlugin::Hide(const CppArgumentList& args, CppVariant* result) {
   HidePlugin();
 }
 
 void BlockedPlugin::HidePlugin() {
   CHECK(plugin_);
+  hidden_ = true;
   WebPluginContainer* container = plugin_->container();
   WebElement element = container->element();
   element.setAttribute("style", "display: none;");
   // If we have a width and height, search for a parent (often <div>) with the
   // same dimensions. If we find such a parent, hide that as well.
   // This makes much more uncovered page content usable (including clickable)
   // as opposed to merely visible.
   // TODO(cevans) -- it's a foul heurisitc but we're going to tolerate it for
   // now for these reasons:
   // 1) Makes the user experience better.
@@ skipping 28 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;");
       }
     }
   }
 }