Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel…

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/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
@@ skipping 69 matching lines @@
     chrome::Navigate(&params);
     return false;
   }
 
   Browser* browser_;
   CrxInstallerError error_;
 };
 
 }  // namespace
 
-ExtensionInstallUIDefault::ExtensionInstallUIDefault(Browser* browser)
+ExtensionInstallUIDefault::ExtensionInstallUIDefault(Profile* profile)
     : skip_post_install_ui_(false),
       previous_using_native_theme_(false),
       use_app_installed_bubble_(false) {
-  browser_ = browser;
+  profile_ = profile;
 
-  // Remember the current theme in case the user presses undo.
-  if (browser) {
-    Profile* profile = browser->profile();
+  // |profile_| can be NULL during tests.
+  if (profile_) {
+    // Remember the current theme in case the user presses undo.
     const Extension* previous_theme =
         ThemeServiceFactory::GetThemeForProfile(profile);
     if (previous_theme)
       previous_theme_id_ = previous_theme->id();
     previous_using_native_theme_ =
         ThemeServiceFactory::GetForProfile(profile)->UsingNativeTheme();
   }
 }
 
 ExtensionInstallUIDefault::~ExtensionInstallUIDefault() {
 }
 
 void ExtensionInstallUIDefault::OnInstallSuccess(const Extension* extension,
                                                  SkBitmap* icon) {
   if (skip_post_install_ui_)
     return;
 
   if (extension->is_theme()) {
     ShowThemeInfoBar(previous_theme_id_, previous_using_native_theme_,
-                     extension, browser_->profile());
+                     extension, profile_);
     return;
   }
 
   // Extensions aren't enabled by default in incognito so we confirm
   // the install in a normal window.
-  Profile* current_profile = browser_->profile()->GetOriginalProfile();
+  Profile* current_profile = profile_->GetOriginalProfile();
   Browser* browser = browser::FindOrCreateTabbedBrowser(current_profile);
   if (browser->tab_count() == 0)
     browser->AddBlankTab(true);
   browser->window()->Show();
 
   bool use_bubble_for_apps = false;
 
 #if defined(TOOLKIT_VIEWS)
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   use_bubble_for_apps = (use_app_installed_bubble_ ||
                          cmdline->HasSwitch(switches::kAppsNewInstallBubble));
 #endif
 
   if (extension->is_app() && !use_bubble_for_apps) {
     ExtensionInstallUI::OpenAppInstalledUI(browser, extension->id());
     return;
   }
 
   chrome::ShowExtensionInstalledBubble(extension, browser, *icon);
 }
 
 void ExtensionInstallUIDefault::OnInstallFailure(
     const CrxInstallerError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (disable_failure_ui_for_tests || skip_post_install_ui_)
     return;
 
-  Browser* browser = browser::FindLastActiveWithProfile(browser_->profile());
+  Browser* browser = browser::FindLastActiveWithProfile(profile_);
   TabContents* tab_contents = chrome::GetActiveTabContents(browser);
   if (!tab_contents)
     return;
   InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       new ErrorInfobarDelegate(infobar_helper, browser, error));
 }
 
 void ExtensionInstallUIDefault::SetSkipPostInstallUI(bool skip_ui) {
   skip_post_install_ui_ = skip_ui;
@@ skipping 56 matching lines @@
   return new ThemeInstalledInfoBarDelegate(
       tab_contents->infobar_tab_helper(),
       profile->GetExtensionService(),
       ThemeServiceFactory::GetForProfile(profile),
       new_theme,
       previous_theme_id,
       previous_using_native_theme);
 }
 
 // static
-ExtensionInstallUI* ExtensionInstallUI::Create(Browser* browser) {
-  return new ExtensionInstallUIDefault(browser);
+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)));
     chrome::Navigate(&params);
 
@@ skipping 12 matching lines @@
 #else
     NOTREACHED();
 #endif
   }
 }
 
 // static
 void ExtensionInstallUI::DisableFailureUIForTests() {
   disable_failure_ui_for_tests = true;
 }