Change infobar creation to use a public static Create() method on the infobar delegate classes.

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/api/infobars/confirm_infobar_delegate.h"
 #include "googleurl/src/gurl.h"
@@ skipping 35 matching lines @@
   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 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(InfoBarService* infobar_service,
                                     HostContentSettingsMap* content_settings,
                                     const string16& name,
                                     const std::string& identifier);
-
- private:
   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_;
 
   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:
-  static InfoBarDelegate* Create(content::WebContents* web_contents,
-                                 PluginInstaller* installer,
-                                 scoped_ptr<PluginMetadata> metadata);
+  // Creates an outdated plugin delegate and adds it to |infobar_service|.
+  static void Create(InfoBarService* infobar_service,
+                     PluginInstaller* installer,
+                     scoped_ptr<PluginMetadata> metadata);
 
  private:
-  OutdatedPluginInfoBarDelegate(content::WebContents* web_contents,
+  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;
@@ skipping 25 matching lines @@
 // a missing plugin.
 class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
                                        public WeakPluginInstallerObserver {
  public:
   typedef base::Callback<void(const PluginMetadata*)> InstallCallback;
 
   // Shows an infobar asking whether to install the plugin represented by
   // |installer|. When the user accepts, |callback| is called.
   // During installation of the plug-in, the infobar will change to reflect the
   // installation state.
-  static InfoBarDelegate* Create(InfoBarService* infobar_service,
-                                 PluginInstaller* installer,
-                                 scoped_ptr<PluginMetadata> plugin_metadata,
-                                 const InstallCallback& callback);
+  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(InfoBarDelegate* infobar,
+                      PluginInstaller* installer,
+                      scoped_ptr<PluginMetadata> metadata,
+                      bool new_install,
+                      const string16& message);
 
  private:
-  friend class OutdatedPluginInfoBarDelegate;
-
   PluginInstallerInfoBarDelegate(InfoBarService* infobar_service,
                                  PluginInstaller* installer,
                                  scoped_ptr<PluginMetadata> plugin_metadata,
                                  const InstallCallback& callback,
                                  bool new_install,
                                  const string16& message);
   virtual ~PluginInstallerInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
@@ skipping 34 matching lines @@
 class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate {
  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
   // purposes require different messages, buttons, etc.
   enum Mode {
     MISSING_PLUGIN,
     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(InfoBarService* infobar_service,
                                  Mode mode,
                                  const string16& name);
-
- private:
   virtual ~PluginMetroModeInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() 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_