Display dialog when app install succeeds / fails on Athena

chrome/browser/ui/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/ui/extensions/extension_install_ui_default.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
@@ skipping 121 matching lines @@
       content::OpenURLParams(
           GURL("http://support.google.com/chrome_webstore/?p=crx_warning"),
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 }  // namespace
 
-
-// ExtensionInstallUI ---------------------------------------------------------
-
-// static
-ExtensionInstallUI* ExtensionInstallUI::Create(Profile* profile) {
-  return new ExtensionInstallUIDefault(profile);
-}
-
-// static
-void ExtensionInstallUI::OpenAppInstalledUI(Profile* profile,
-                                            const std::string& app_id) {
-#if defined(OS_CHROMEOS)
-  // App Launcher always enabled on ChromeOS, so always handled in
-  // OnInstallSuccess.
-  NOTREACHED();
-#else
-  Browser* browser = FindOrCreateVisibleBrowser(profile);
-  if (browser) {
-    GURL url(chrome::IsInstantExtendedAPIEnabled() ?
-             chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
-    chrome::NavigateParams params(
-        chrome::GetSingletonTabNavigateParams(browser, url));
-    chrome::Navigate(&params);
-
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_APP_INSTALLED_TO_NTP,
-        content::Source<WebContents>(params.target_contents),
-        content::Details<const std::string>(&app_id));
-  }
-#endif
-}
-
-// static
-ExtensionInstallPrompt* ExtensionInstallUI::CreateInstallPromptWithBrowser(
-    Browser* browser) {
-  content::WebContents* web_contents = NULL;
-  if (browser)
-    web_contents = browser->tab_strip_model()->GetActiveWebContents();
-  return new ExtensionInstallPrompt(web_contents);
-}
-
-// static
-ExtensionInstallPrompt* ExtensionInstallUI::CreateInstallPromptWithProfile(
-    Profile* profile) {
-  Browser* browser = chrome::FindLastActiveWithProfile(profile,
-      chrome::GetActiveDesktop());
-  if (browser)
-    return CreateInstallPromptWithBrowser(browser);
-  // No browser window is open yet. Create a free-standing dialog associated
-  // with |profile|.
-  return new ExtensionInstallPrompt(profile, NULL, NULL);
-}
-
-
 // ExtensionInstallUIDefault --------------------------------------------------
 
 ExtensionInstallUIDefault::ExtensionInstallUIDefault(Profile* profile)
     : ExtensionInstallUI(profile),
       previous_using_system_theme_(false),
       use_app_installed_bubble_(false) {
   // |profile| can be NULL during tests.
   if (profile) {
     // Remember the current theme in case the user presses undo.
     const Extension* previous_theme =
@@ skipping 41 matching lines @@
       AppListService::Get(chrome::GetActiveDesktop())
           ->ShowForAppInstall(current_profile, extension->id(), false);
       return;
     }
 
     if (use_bubble) {
       ShowExtensionInstalledBubble(extension, current_profile, *icon);
       return;
     }
 
-    ExtensionInstallUI::OpenAppInstalledUI(current_profile, extension->id());
+    OpenAppInstalledUI(extension->id());
     return;
   }
 
   ShowExtensionInstalledBubble(extension, current_profile, *icon);
 }
 
 void ExtensionInstallUIDefault::OnInstallFailure(
     const extensions::CrxInstallerError& error) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (disable_failure_ui_for_tests() || skip_post_install_ui())
     return;
 
   Browser* browser =
       chrome::FindLastActiveWithProfile(profile(), chrome::GetActiveDesktop());
   if (!browser)  // Can be NULL in unittests.
     return;
   WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return;
   ErrorInfoBarDelegate::Create(InfoBarService::FromWebContents(web_contents),
                                error);
 }
 
+void ExtensionInstallUIDefault::OpenAppInstalledUI(const std::string& app_id) {
+#if defined(OS_CHROMEOS)
+  // App Launcher always enabled on ChromeOS, so always handled in
+  // OnInstallSuccess.
+  NOTREACHED();
+#else
+  Browser* browser = FindOrCreateVisibleBrowser(profile);
+  if (browser) {
+    GURL url(chrome::IsInstantExtendedAPIEnabled() ?
+             chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
+    chrome::NavigateParams params(
+        chrome::GetSingletonTabNavigateParams(browser, url));
+    chrome::Navigate(&params);
+
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_APP_INSTALLED_TO_NTP,
+        content::Source<WebContents>(params.target_contents),
+        content::Details<const std::string>(&app_id));
+  }
+#endif
+}
+
+ExtensionInstallPrompt* ExtensionInstallUIDefault::CreateInstallPrompt() {
+  Browser* browser = chrome::FindLastActiveWithProfile(profile(),
+      chrome::GetActiveDesktop());
+  if (browser) {
+    content::WebContents* web_contents =
+        browser->tab_strip_model()->GetActiveWebContents();
+    return new ExtensionInstallPrompt(web_contents);
+  }
+  // No browser window is open yet. Create a free-standing dialog associated
+  // with |profile|.
+  return new ExtensionInstallPrompt(profile(), NULL, NULL);
+}
+
 void ExtensionInstallUIDefault::SetUseAppInstalledBubble(bool use_bubble) {
   use_app_installed_bubble_ = use_bubble;
 }