ntp4: app install improvements

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2011 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.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/simple_message_box.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
@@ skipping 31 matching lines @@
   IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WANTS_ACCESS_TO,
 };
 
 namespace {
 
 // Size of extension icon in top left of dialog.
 const int kIconSize = 69;
 
-// Shows the application install animation on the new tab page for the app
-// with |app_id|. If a NTP already exists on the active |browser|, this will
-// select that tab and show the animation there. Otherwise, it will create
-// a new NTP.
-void ShowAppInstalledAnimation(Browser* browser, const std::string& app_id) {
-  // Select an already open NTP, if there is one. Existing NTPs will
-  // automatically show the install animation for any new apps.
-  for (int i = 0; i < browser->tab_count(); ++i) {
-    GURL url = browser->GetTabContentsAt(i)->GetURL();
-    if (url.SchemeIs(chrome::kChromeUIScheme) &&
-        url.host() == chrome::kChromeUINewTabHost) {
-      browser->ActivateTabAt(i, false);
-      return;
-    }
-  }
-
-  // If there isn't an NTP, open one.
-  ExtensionInstallUI::OpenAppInstalledNTP(browser, app_id);
-}
-
 }  // namespace
 
 ExtensionInstallUI::ExtensionInstallUI(Profile* profile)
     : profile_(profile),
       ui_loop_(MessageLoop::current()),
       previous_using_native_theme_(false),
       extension_(NULL),
       delegate_(NULL),
       prompt_type_(NUM_PROMPT_TYPES),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
@@ skipping 73 matching lines @@
 
   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) {
-    ShowAppInstalledAnimation(browser, extension->id());
+    ExtensionInstallUI::OpenAppInstalledNTP(browser, extension->id());
     return;
   }
 
   browser::ShowExtensionInstalledBubble(extension, browser, icon_, profile);
 }
 
 namespace {
 
 bool disable_failure_ui_for_tests = false;
 
@@ skipping 45 matching lines @@
       NOTREACHED() << "Unknown message";
       break;
   }
 }
 
 // static
 void ExtensionInstallUI::OpenAppInstalledNTP(Browser* browser,
                                              const std::string& app_id) {
   std::string url = base::StringPrintf(
       "%s#app-id=%s", chrome::kChromeUINewTabURL, app_id.c_str());
-  browser->AddSelectedTabWithURL(GURL(url), PageTransition::TYPED);
+  browser::NavigateParams params =
+      browser->GetSingletonTabNavigateParams(GURL(url));
+  params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
+  browser::Navigate(&params);
 }
 
 // static
 void ExtensionInstallUI::DisableFailureUIForTests() {
   disable_failure_ui_for_tests = true;
 }
 
 void ExtensionInstallUI::ShowThemeInfoBar(const std::string& previous_theme_id,
                                           bool previous_using_native_theme,
                                           const Extension* new_theme,
@@ skipping 51 matching lines @@
 
 InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate(
     TabContents* tab_contents,
     const Extension* new_theme,
     const std::string& previous_theme_id,
     bool previous_using_native_theme) {
   return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
                                            previous_theme_id,
                                            previous_using_native_theme);
 }