Infobar Componentization Proof of Concept

chrome/browser/plugins/plugin_infobar_delegates.h

Index: chrome/browser/plugins/plugin_infobar_delegates.h
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h
index cde823566f405fb76261f4d3df26d917692476c5..e007c74189ea20fc3760ce496becf5520558a33f 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.h
+++ b/chrome/browser/plugins/plugin_infobar_delegates.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_
 
 #include "base/callback.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/content_confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
@@ -22,9 +22,10 @@ class WebContents;
 }
 
 // Base class for blocked plug-in infobars.
-class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
+class PluginInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  protected:
-  explicit PluginInfoBarDelegate(const std::string& identifier);
+  explicit PluginInfoBarDelegate(content::WebContents* web_contents,
+                                 const std::string& identifier);
   virtual ~PluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
@@ -55,7 +56,8 @@ class UnauthorizedPluginInfoBarDelegate : public PluginInfoBarDelegate {
                      const std::string& identifier);
 
  private:
-  UnauthorizedPluginInfoBarDelegate(HostContentSettingsMap* content_settings,
+  UnauthorizedPluginInfoBarDelegate(content::WebContents* web_contents,
+                                    HostContentSettingsMap* content_settings,
                                     const base::string16& name,
                                     const std::string& identifier);
   virtual ~UnauthorizedPluginInfoBarDelegate();
@@ -87,7 +89,8 @@ class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
                      scoped_ptr<PluginMetadata> metadata);
 
  private:
-  OutdatedPluginInfoBarDelegate(PluginInstaller* installer,
+  OutdatedPluginInfoBarDelegate(content::WebContents* web_contents,
+                                PluginInstaller* installer,
                                 scoped_ptr<PluginMetadata> metadata,
                                 const base::string16& message);
   virtual ~OutdatedPluginInfoBarDelegate();
@@ -123,7 +126,7 @@ class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
 
 // The main purpose for this class is to popup/close the infobar when there is
 // a missing plugin.
-class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
+class PluginInstallerInfoBarDelegate : public ContentConfirmInfoBarDelegate,
                                        public WeakPluginInstallerObserver {
  public:
   typedef base::Callback<void(const PluginMetadata*)> InstallCallback;
@@ -139,14 +142,16 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
 
   // Replaces |infobar|, which must currently be owned, with an infobar asking
   // the user to install or update a particular plugin.
-  static void Replace(InfoBar* infobar,
+  static void Replace(content::WebContents* web_contents,
+                      InfoBar* infobar,
                       PluginInstaller* installer,
                       scoped_ptr<PluginMetadata> plugin_metadata,
                       bool new_install,
                       const base::string16& message);
 
  private:
-  PluginInstallerInfoBarDelegate(PluginInstaller* installer,
+  PluginInstallerInfoBarDelegate(content::WebContents* web_contents,
+                                 PluginInstaller* installer,
                                  scoped_ptr<PluginMetadata> metadata,
                                  const InstallCallback& callback,
                                  bool new_install,
@@ -189,7 +194,7 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
 #if defined(OS_WIN)
-class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate {
+class PluginMetroModeInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  public:
   // The infobar can be used for two purposes: to inform the user about a
   // missing plugin or to note that a plugin only works in desktop mode.  These
@@ -206,7 +211,9 @@ class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate {
                      const base::string16& name);
 
  private:
-  PluginMetroModeInfoBarDelegate(Mode mode, const base::string16& name);
+  PluginMetroModeInfoBarDelegate(content::WebContents* web_contents,
+                                 Mode mode,
+                                 const base::string16& name);
   virtual ~PluginMetroModeInfoBarDelegate();
 
   // ConfirmInfoBarDelegate: