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

chrome/browser/extensions/extension_install_ui_default.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/extensions/extension_install_ui_default.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
@@ skipping 34 matching lines @@
 using content::WebContents;
 using extensions::Extension;
 
 namespace {
 
 bool disable_failure_ui_for_tests = false;
 
 // Helper class to put up an infobar when installation fails.
 class ErrorInfobarDelegate : public ConfirmInfoBarDelegate {
  public:
+  // Creates an error delegate and adds it to |infobar_service|.
+  static void Create(InfoBarService* infobar_service,
+                     Browser* browser,
+                     const extensions::CrxInstallerError& error);
+
+ private:
   ErrorInfobarDelegate(InfoBarService* infobar_service,
                        Browser* browser,
                        const extensions::CrxInstallerError& error)
       : ConfirmInfoBarDelegate(infobar_service),
         browser_(browser),
         error_(error) {
   }
 
- private:
   virtual string16 GetMessageText() const OVERRIDE {
     return error_.message();
   }
 
   virtual int GetButtons() const OVERRIDE {
     return BUTTON_OK;
   }
 
   virtual string16 GetLinkText() const OVERRIDE {
     return error_.type() == extensions::CrxInstallerError::ERROR_OFF_STORE ?
         l10n_util::GetStringUTF16(IDS_LEARN_MORE) : ASCIIToUTF16("");
   }
 
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE {
     chrome::NavigateParams params(
         browser_,
         GURL("http://support.google.com/chrome_webstore/?p=crx_warning"),
         content::PAGE_TRANSITION_LINK);
     params.disposition = NEW_FOREGROUND_TAB;
     chrome::Navigate(&params);
     return false;
   }
 
   Browser* browser_;
   extensions::CrxInstallerError error_;
 };
 
+// static
+void ErrorInfobarDelegate::Create(InfoBarService* infobar_service,
+                                  Browser* browser,
+                                  const extensions::CrxInstallerError& error) {
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new ErrorInfobarDelegate(infobar_service, browser, error)));
+}
+
 }  // namespace
 
 ExtensionInstallUIDefault::ExtensionInstallUIDefault(Profile* profile)
     : skip_post_install_ui_(false),
       previous_using_native_theme_(false),
       use_app_installed_bubble_(false) {
   profile_ = profile;
 
   // |profile_| can be NULL during tests.
   if (profile_) {
@@ skipping 16 matching lines @@
     return;
 
   if (!profile_) {
     // TODO(zelidrag): Figure out what exact conditions cause crash
     // http://crbug.com/159437 and write browser test to cover it.
     NOTREACHED();
     return;
   }
 
   if (extension->is_theme()) {
-    ShowThemeInfoBar(previous_theme_id_, previous_using_native_theme_,
-                     extension, profile_);
+    ThemeInstalledInfoBarDelegate::Create(
+        extension, profile_, previous_theme_id_, previous_using_native_theme_);
     return;
   }
 
   // Extensions aren't enabled by default in incognito so we confirm
   // the install in a normal window.
   Profile* current_profile = profile_->GetOriginalProfile();
   Browser* browser =
       chrome::FindOrCreateTabbedBrowser(current_profile,
                                         chrome::GetActiveDesktop());
   if (browser->tab_count() == 0)
@@ skipping 20 matching lines @@
     const extensions::CrxInstallerError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (disable_failure_ui_for_tests || skip_post_install_ui_)
     return;
 
   Browser* browser = chrome::FindLastActiveWithProfile(profile_,
       chrome::GetActiveDesktop());
   WebContents* web_contents = chrome::GetActiveWebContents(browser);
   if (!web_contents)
     return;
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  infobar_service->AddInfoBar(
-      new ErrorInfobarDelegate(infobar_service, browser, error));
+  ErrorInfobarDelegate::Create(InfoBarService::FromWebContents(web_contents),
+                               browser, error);
 }
 
 void ExtensionInstallUIDefault::SetSkipPostInstallUI(bool skip_ui) {
   skip_post_install_ui_ = skip_ui;
 }
 
 void ExtensionInstallUIDefault::SetUseAppInstalledBubble(bool use_bubble) {
   use_app_installed_bubble_ = use_bubble;
 }
 
 // static
-void ExtensionInstallUIDefault::ShowThemeInfoBar(
-    const std::string& previous_theme_id, bool previous_using_native_theme,
-    const Extension* new_theme, Profile* profile) {
-  if (!new_theme->is_theme())
-    return;
-
-  // Get last active tabbed browser of profile.
-  Browser* browser = browser::FindTabbedBrowser(profile,
-                                                true,
-                                                chrome::GetActiveDesktop());
-  if (!browser)
-    return;
-
-  WebContents* web_contents = chrome::GetActiveWebContents(browser);
-  if (!web_contents)
-    return;
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-
-  // First find any previous theme preview infobars.
-  InfoBarDelegate* old_delegate = NULL;
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
-    InfoBarDelegate* delegate = infobar_service->GetInfoBarDelegateAt(i);
-    ThemeInstalledInfoBarDelegate* theme_infobar =
-        delegate->AsThemePreviewInfobarDelegate();
-    if (theme_infobar) {
-      // If the user installed the same theme twice, ignore the second install
-      // and keep the first install info bar, so that they can easily undo to
-      // get back the previous theme.
-      if (theme_infobar->MatchesTheme(new_theme))
-        return;
-      old_delegate = delegate;
-      break;
-    }
-  }
-
-  // Then either replace that old one or add a new one.
-  InfoBarDelegate* new_delegate = GetNewThemeInstalledInfoBarDelegate(
-      web_contents, new_theme, previous_theme_id, previous_using_native_theme);
-
-  if (old_delegate)
-    infobar_service->ReplaceInfoBar(old_delegate, new_delegate);
-  else
-    infobar_service->AddInfoBar(new_delegate);
-}
-
-InfoBarDelegate* ExtensionInstallUIDefault::GetNewThemeInstalledInfoBarDelegate(
-    WebContents* web_contents,
-    const Extension* new_theme,
-    const std::string& previous_theme_id,
-    bool previous_using_native_theme) {
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  return new ThemeInstalledInfoBarDelegate(
-      InfoBarService::FromWebContents(web_contents),
-      profile->GetExtensionService(),
-      ThemeServiceFactory::GetForProfile(profile),
-      new_theme,
-      previous_theme_id,
-      previous_using_native_theme);
-}
-
-// static
 ExtensionInstallUI* ExtensionInstallUI::Create(Profile* profile) {
   return new ExtensionInstallUIDefault(profile);
 }
 
 // static
 void ExtensionInstallUI::OpenAppInstalledUI(Browser* browser,
                                             const std::string& app_id) {
   if (NewTabUI::ShouldShowApps()) {
     chrome::NavigateParams params(chrome::GetSingletonTabNavigateParams(
         browser, GURL(chrome::kChromeUINewTabURL)));
@@ skipping 31 matching lines @@
   return new ExtensionInstallPrompt(web_contents);
 }
 
 // static
 ExtensionInstallPrompt* ExtensionInstallUI::CreateInstallPromptWithProfile(
     Profile* profile) {
   Browser* browser = chrome::FindLastActiveWithProfile(profile,
       chrome::GetActiveDesktop());
   return CreateInstallPromptWithBrowser(browser);
 }