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

chrome/browser/ui/startup/autolaunch_prompt_win.cc

 // 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.
 
 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
@@ skipping 18 matching lines @@
 
 using content::BrowserThread;
 
 namespace {
 
 const int kMaxInfobarShown = 5;
 
 // The delegate for the infobar shown when Chrome was auto-launched.
 class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
+  // Creates an autolaunch delegate and adds it to |infobar_service|.
+  static void Create(InfoBarService* infobar_service,
+                     PrefService* prefs,
+                     Profile* profile);
+
+ private:
   AutolaunchInfoBarDelegate(InfoBarService* infobar_service,
                             PrefService* prefs,
                             Profile* profile);
   virtual ~AutolaunchInfoBarDelegate();
 
- private:
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool ShouldExpireInternal(
       const content::LoadCommittedDetails& details) const OVERRIDE;
 
   // The prefs to use.
   PrefService* prefs_;
 
   // Whether the user clicked one of the buttons.
   bool action_taken_;
 
   // Whether the info-bar should be dismissed on the next navigation.
   bool should_expire_;
 
   // Weak pointer to the profile, not owned by us.
   Profile* profile_;
 
   // Used to delay the expiration of the info-bar.
   base::WeakPtrFactory<AutolaunchInfoBarDelegate> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutolaunchInfoBarDelegate);
 };
 
+// static
+void AutolaunchInfoBarDelegate::Create(InfoBarService* infobar_service,
+                                       PrefService* prefs,
+                                       Profile* profile) {
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new AutolaunchInfoBarDelegate(infobar_service, prefs, profile)));
+}
+
 AutolaunchInfoBarDelegate::AutolaunchInfoBarDelegate(
     InfoBarService* infobar_service,
     PrefService* prefs,
     Profile* profile)
     : ConfirmInfoBarDelegate(infobar_service),
       prefs_(prefs),
       action_taken_(false),
       should_expire_(false),
       profile_(profile),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
@@ skipping 84 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kChromeFrame))
     return false;
 
   if (!command_line.HasSwitch(switches::kAutoLaunchAtStartup) &&
       !first_run::IsChromeFirstRun()) {
     return false;
   }
 
   content::WebContents* web_contents = chrome::GetActiveWebContents(browser);
-
-  // Don't show the info-bar if there are already info-bars showing.
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  if (infobar_service->GetInfoBarCount() > 0)
-    return false;
-
   profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  infobar_service->AddInfoBar(new AutolaunchInfoBarDelegate(
-      infobar_service, profile->GetPrefs(), profile));
-
+  AutolaunchInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents), profile->GetPrefs(),
+      profile);
   return true;
 }
 
 void RegisterAutolaunchUserPrefs(PrefServiceSyncable* prefs) {
   prefs->RegisterIntegerPref(
       prefs::kShownAutoLaunchInfobar, 0, PrefServiceSyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace chrome