Switch BlockedPlugins away from using notifications...

chrome/renderer/render_view.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/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 868 matching lines @@
   // Plugins start assuming the content has focus (so that they work in
   // environments where RenderView isn't hosting them), so we always have to
   // set the initial state. See webplugin_delegate_impl.h for details.
   delegate->SetContentAreaFocus(has_focus());
 }
 
 void RenderView::UnregisterPluginDelegate(WebPluginDelegateProxy* delegate) {
   plugin_delegates_.erase(delegate);
 }
 
+void RenderView::RegisterBlockedPlugin(BlockedPlugin* blocked_plugin) {
+  blocked_plugins_.insert(blocked_plugin);
+}
+
+void RenderView::UnregisterBlockedPlugin(BlockedPlugin* blocked_plugin) {
+  blocked_plugins_.erase(blocked_plugin);
+}
+
 void RenderView::Init(gfx::NativeViewId parent_hwnd,
                       int32 opener_id,
                       const RendererPreferences& renderer_prefs,
                       SharedRenderViewCounter* counter,
                       int32 routing_id,
                       const string16& frame_name) {
   DCHECK(!webview());
 
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
@@ skipping 3864 matching lines @@
   translate_helper_.RevertTranslation(page_id);
 }
 
 void RenderView::OnInstallMissingPlugin() {
   // This could happen when the first default plugin is deleted.
   if (first_default_plugin_)
     first_default_plugin_->InstallMissingPlugin();
 }
 
 void RenderView::OnLoadBlockedPlugins() {
-  current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS] =
-      CONTENT_SETTING_ALLOW;
-  NotificationService::current()->Notify(NotificationType::SHOULD_LOAD_PLUGINS,
-                                         Source<RenderView>(this),
-                                         NotificationService::NoDetails());
+  while (!blocked_plugins_.empty())
+    (*blocked_plugins_.begin())->LoadPlugin();
 }
 
 void RenderView::OnFileChooserResponse(const std::vector<FilePath>& paths) {
   // This could happen if we navigated to a different page before the user
   // closed the chooser.
   if (file_chooser_completions_.empty())
     return;
 
   WebVector<WebString> ws_file_names(paths.size());
   for (size_t i = 0; i < paths.size(); ++i)
@@ skipping 986 matching lines @@
 }
 #endif
 
 void RenderView::OnJavaScriptStressTestControl(int cmd, int param) {
   if (cmd == kJavaScriptStressTestSetStressRunType) {
     v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param));
   } else if (cmd == kJavaScriptStressTestPrepareStressRun) {
     v8::Testing::PrepareStressRun(param);
   }
 }