Clean up plug-in placeholders:

chrome/renderer/plugins/blocked_plugin.h

 // 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.
 
-#ifndef CHROME_RENDERER_BLOCKED_PLUGIN_H_
-#define CHROME_RENDERER_BLOCKED_PLUGIN_H_
+#ifndef CHROME_RENDERER_PLUGINS_BLOCKED_PLUGIN_H_
+#define CHROME_RENDERER_PLUGINS_BLOCKED_PLUGIN_H_
 #pragma once
 
-#include "content/public/renderer/render_view_observer.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
-#include "webkit/glue/cpp_bound_class.h"
-#include "webkit/plugins/npapi/webview_plugin.h"
+#include "chrome/renderer/plugins/plugin_placeholder.h"
 #include "webkit/plugins/webplugininfo.h"
 
-class BlockedPlugin : public content::RenderViewObserver,
-                      public CppBoundClass,
-                      public webkit::npapi::WebViewPlugin::Delegate {
+namespace webkit {
+namespace npapi {
+class PluginGroup;
+}
+}
+
+class BlockedPlugin : public PluginPlaceholder {
  public:
+  static webkit::npapi::WebViewPlugin* Create(

[battre, 2011/11/22 09:57:15]

Document owernship of passed pointers?

+      content::RenderView* render_view,
+      WebKit::WebFrame* frame,
+      const WebKit::WebPluginParams& params,
+      const webkit::WebPluginInfo& info,
+      const webkit::npapi::PluginGroup* group,
+      int resource_id,
+      int message_id,
+      bool is_blocked_for_prerendering,
+      bool allow_loading);
+
+ private:
   BlockedPlugin(content::RenderView* render_view,
                 WebKit::WebFrame* frame,
+                const WebKit::WebPluginParams& params,
+                const std::string& html_data,
                 const webkit::WebPluginInfo& info,
-                const WebKit::WebPluginParams& params,
-                const WebPreferences& settings,
-                int template_id,
                 const string16& name,
-                const string16& message,
                 bool is_blocked_for_prerendering,
                 bool allow_loading);
-
-  webkit::npapi::WebViewPlugin* plugin() { return plugin_; }
+  virtual ~BlockedPlugin();
 
   // WebViewPlugin::Delegate methods:
   virtual void BindWebFrame(WebKit::WebFrame* frame);
-  virtual void WillDestroyPlugin();
   virtual void ShowContextMenu(const WebKit::WebMouseEvent&);
 
- private:
-  virtual ~BlockedPlugin();
-
   // RenderViewObserver methods:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void ContextMenuAction(unsigned id) OVERRIDE;
 
   void OnLoadBlockedPlugins();
   void OnSetIsPrerendering(bool is_prerendering);
 
   // Javascript callbacks:
   // Load the blocked plugin by calling LoadPlugin().
   // Takes no arguments, and returns nothing.
   void LoadCallback(const CppArgumentList& args, CppVariant* result);
 
   // Hide the blocked plugin by calling HidePlugin().
   // Takes no arguments, and returns nothing.
   void HideCallback(const CppArgumentList& args, CppVariant* result);
 
   // Opens a URL in a new tab.
   // Takes one argument, a string specifying the URL to open. Returns nothing.
   void OpenUrlCallback(const CppArgumentList& args, CppVariant* result);
 
   // Load the blocked plugin.
   void LoadPlugin();
 
   // Hide the blocked plugin.
   void HidePlugin();
 
-  WebKit::WebFrame* frame_;
   webkit::WebPluginInfo plugin_info_;
-  WebKit::WebPluginParams plugin_params_;
-  webkit::npapi::WebViewPlugin* plugin_;
   // The name of the plugin that was blocked.
   string16 name_;
   // True iff the plugin was blocked because the page was being prerendered.
   // Plugin will automatically be loaded when the page is displayed.
   bool is_blocked_for_prerendering_;
   bool hidden_;
   bool allow_loading_;

[battre, 2011/11/22 09:57:15]

DISALLOW_COPY_AND_ASSIGN?

 };
 
-#endif  // CHROME_RENDERER_BLOCKED_PLUGIN_H_
+#endif  // CHROME_RENDERER_PLUGINS_BLOCKED_PLUGIN_H_