Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/plugins/plugin_infobar_delegates.h

 // Copyright (c) 2012 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_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_
 
 #include "base/callback.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugin_installer_observer.h"
 #endif
 
 class InfoBarService;
 class HostContentSettingsMap;
 class PluginMetadata;
 
 namespace content {
 class WebContents;
 }
 
 // Base class for blocked plug-in infobars.
 class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  protected:
-  explicit PluginInfoBarDelegate(const std::string& identifier);
+  PluginInfoBarDelegate(InfoBarService* infobar_service,
+                        const std::string& identifier);
   virtual ~PluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   virtual std::string GetLearnMoreURL() const = 0;
 
   void LoadBlockedPlugins();
 
  private:
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
 
   std::string identifier_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInfoBarDelegate);
 };
 
 // Infobar that's shown when a plug-in requires user authorization to run.
 class UnauthorizedPluginInfoBarDelegate : public PluginInfoBarDelegate {
  public:
-  // Creates an unauthorized plugin infobar and delegate and adds the infobar to
+  // Creates an unauthorized plugin infobar delegate and adds it to
   // |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      HostContentSettingsMap* content_settings,
                      const string16& name,
                      const std::string& identifier);
 
  private:
-  UnauthorizedPluginInfoBarDelegate(HostContentSettingsMap* content_settings,
+  UnauthorizedPluginInfoBarDelegate(InfoBarService* infobar_service,
+                                    HostContentSettingsMap* content_settings,
                                     const string16& name,
                                     const std::string& identifier);
   virtual ~UnauthorizedPluginInfoBarDelegate();
 
   // PluginInfoBarDelegate:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
   virtual std::string GetLearnMoreURL() const OVERRIDE;
 
   HostContentSettingsMap* content_settings_;
   string16 name_;
 
   DISALLOW_COPY_AND_ASSIGN(UnauthorizedPluginInfoBarDelegate);
 };
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 // Infobar that's shown when a plug-in is out of date.
 class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
                                       public WeakPluginInstallerObserver {
  public:
-  // Creates an outdated plugin infobar and delegate and adds the infobar to
+  // Creates an outdated plugin infobar delegate and adds it to
   // |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      PluginInstaller* installer,
                      scoped_ptr<PluginMetadata> metadata);
 
  private:
-  OutdatedPluginInfoBarDelegate(PluginInstaller* installer,
+  OutdatedPluginInfoBarDelegate(InfoBarService* infobar_service,
+                                PluginInstaller* installer,
                                 scoped_ptr<PluginMetadata> metadata,
                                 const string16& message);
   virtual ~OutdatedPluginInfoBarDelegate();
 
   // PluginInfoBarDelegate:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
@@ skipping 31 matching lines @@
   // |installer|. When the user accepts, |callback| is called.
   // During installation of the plug-in, the infobar will change to reflect the
   // installation state.
   static void Create(InfoBarService* infobar_service,
                      PluginInstaller* installer,
                      scoped_ptr<PluginMetadata> plugin_metadata,
                      const InstallCallback& callback);
 
   // 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(InfoBarDelegate* infobar,
                       PluginInstaller* installer,
                       scoped_ptr<PluginMetadata> plugin_metadata,
                       bool new_install,
                       const string16& message);
 
  private:
-  PluginInstallerInfoBarDelegate(PluginInstaller* installer,
-                                 scoped_ptr<PluginMetadata> metadata,
+  PluginInstallerInfoBarDelegate(InfoBarService* infobar_service,
+                                 PluginInstaller* installer,
+                                 scoped_ptr<PluginMetadata> plugin_metadata,
                                  const InstallCallback& callback,
                                  bool new_install,
                                  const string16& message);
   virtual ~PluginInstallerInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
@@ skipping 38 matching lines @@
     DESKTOP_MODE_REQUIRED,
   };
 
   // Creates a metro mode infobar and delegate and adds the infobar to
   // |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      Mode mode,
                      const string16& name);
 
  private:
-  PluginMetroModeInfoBarDelegate(Mode mode, const string16& name);
+  PluginMetroModeInfoBarDelegate(InfoBarService* infobar_service,
+                                 Mode mode,
+                                 const string16& name);
   virtual ~PluginMetroModeInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   const Mode mode_;
   const string16 name_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginMetroModeInfoBarDelegate);
 };
 #endif  // defined(OS_WIN)
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_