Remove experimental sync promo layouts

chrome/browser/ui/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 47 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/tabs/tab_strip_model.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/dialog_style.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
-#include "chrome/browser/ui/webui/sync_promo/sync_promo_dialog.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
@@ skipping 1132 matching lines @@
     bool process_startup,
     const std::vector<GURL>& urls) {
   std::vector<Tab> tabs;
   UrlsToTabs(urls, &tabs);
   return OpenTabsInBrowser(browser, process_startup, tabs);
 }
 
 Browser* BrowserInit::LaunchWithProfile::OpenTabsInBrowser(
         Browser* browser,
         bool process_startup,
-        const std::vector<Tab>& in_tabs) {
-  DCHECK(!in_tabs.empty());
+        const std::vector<Tab>& tabs) {
+  DCHECK(!tabs.empty());
 
   // If we don't yet have a profile, try to use the one we're given from
   // |browser|. While we may not end up actually using |browser| (since it
   // could be a popup window), we can at least use the profile.
   if (!profile_ && browser)
     profile_ = browser->profile();
 
-  std::vector<Tab> tabs(in_tabs);
-  size_t active_tab_index =
-      ShowSyncPromoDialog(process_startup, &browser, &tabs);
-  bool first_tab = active_tab_index == std::string::npos;
-
   if (!browser || !browser->is_type_tabbed()) {
     browser = Browser::Create(profile_);
   } else {
 #if defined(TOOLKIT_GTK)
     // Setting the time of the last action on the window here allows us to steal
     // focus, which is what the user wants when opening a new tab in an existing
     // browser window.
     gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle());
 #endif
   }
 
 #if !defined(OS_MACOSX)
   // In kiosk mode, we want to always be fullscreen, so switch to that now.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
     browser->ToggleFullscreenMode();
 #endif
 
+  bool first_tab = true;
   for (size_t i = 0; i < tabs.size(); ++i) {
     // We skip URLs that we'd have to launch an external protocol handler for.
     // This avoids us getting into an infinite loop asking ourselves to open
     // a URL, should the handler be (incorrectly) configured to be us. Anyone
     // asking us to open such a URL should really ask the handler directly.
     bool handled_by_chrome = ProfileIOData::IsHandledURL(tabs[i].url) ||
         (profile_ && profile_->GetProtocolHandlerRegistry()->IsHandledProtocol(
             tabs[i].url.scheme()));
     if (!process_startup && !handled_by_chrome)
       continue;
 
-    size_t index;
-    if (tabs[i].url.SchemeIs(chrome::kChromeUIScheme) &&
-        tabs[i].url.host() == chrome::kChromeUISyncPromoHost) {
-      // The sync promo must always be the first tab. If the browser window
-      // was spawned from the sync promo dialog then it might have other tabs
-      // in it already. Explicilty set it to 0 to ensure that it's first.
-      index = 0;
-    } else {
-      index = browser->GetIndexForInsertionDuringRestore(i);
-    }
-
-    int add_types = (first_tab || index == active_tab_index) ?
-        TabStripModel::ADD_ACTIVE : TabStripModel::ADD_NONE;
+    int add_types = first_tab ? TabStripModel::ADD_ACTIVE :
+                                TabStripModel::ADD_NONE;
     add_types |= TabStripModel::ADD_FORCE_INDEX;
     if (tabs[i].is_pinned)
       add_types |= TabStripModel::ADD_PINNED;
+    int index = browser->GetIndexForInsertionDuringRestore(i);
 
     browser::NavigateParams params(browser, tabs[i].url,
                                    content::PAGE_TRANSITION_START_PAGE);
-    params.disposition = (first_tab || index == active_tab_index) ?
-        NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+    params.disposition = first_tab ? NEW_FOREGROUND_TAB :
+                                     NEW_BACKGROUND_TAB;
     params.tabstrip_index = index;
     params.tabstrip_add_types = add_types;
     params.extension_app_id = tabs[i].app_id;
     browser::Navigate(&params);
 
     first_tab = false;
   }
   if (!browser->GetSelectedWebContents()) {
     // TODO: this is a work around for 110909. Figure out why it's needed.
     if (!browser->tab_count())
@@ skipping 187 matching lines @@
     if (prefs->FindPreference(prefs::kShouldShowWelcomePage) &&
         prefs->GetBoolean(prefs::kShouldShowWelcomePage)) {
       // Reset the preference so we don't show the welcome page next time.
       prefs->ClearPref(prefs::kShouldShowWelcomePage);
       startup_urls->push_back(GetWelcomePageURL());
     }
   }
 
   // If the sync promo page is going to be displayed then insert it at the front
   // of the list.
-  bool promo_suppressed = false;
-  if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_,
-                                                &promo_suppressed)) {
+  if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) {
     SyncPromoUI::DidShowSyncPromoAtStartup(profile_);
     GURL old_url = (*startup_urls)[0];
     (*startup_urls)[0] =
         SyncPromoUI::GetSyncPromoURL(GURL(chrome::kChromeUINewTabURL), true,
                                      std::string());
 
     // An empty URL means to go to the home page.
     if (old_url.is_empty() &&
         profile_->GetHomePage() == GURL(chrome::kChromeUINewTabURL)) {
       old_url = GURL(chrome::kChromeUINewTabURL);
     }
 
     // If the old URL is not the NTP then insert it right after the sync promo.
     if (old_url != GURL(chrome::kChromeUINewTabURL))
       startup_urls->insert(startup_urls->begin() + 1, old_url);
 
     // If we have more than two startup tabs then skip the welcome page.
     if (startup_urls->size() > 2) {
       std::vector<GURL>::iterator it = std::find(
           startup_urls->begin(), startup_urls->end(), GetWelcomePageURL());
       if (it != startup_urls->end())
         startup_urls->erase(it);
     }
-  } else if (promo_suppressed) {
-    sync_promo_trial::RecordSyncPromoSuppressedForCurrentTrial();
   }
 }
 
 void BrowserInit::LaunchWithProfile::CheckDefaultBrowser(Profile* profile) {
   // We do not check if we are the default browser if:
   // - the user said "don't ask me again" on the infobar earlier.
   // - this is the first launch after the first run flow.
   // - There is a policy in control of this setting.
   if (!profile->GetPrefs()->GetBoolean(prefs::kCheckDefaultBrowser) ||
       is_first_run_) {
@@ skipping 40 matching lines @@
   if (command_line.HasSwitch(switches::kAutoLaunchAtStartup) ||
       first_run::IsChromeFirstRun()) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             base::Bind(&CheckAutoLaunchCallback));
     return true;
   }
 #endif
   return false;
 }
 
-size_t BrowserInit::LaunchWithProfile::ShowSyncPromoDialog(
-    bool process_startup,
-    Browser** browser,
-    std::vector<Tab>* tabs) {
-  DCHECK(browser);
-  DCHECK(tabs);
-
-  // The dialog is only shown on process startup if no browser window is already
-  // being displayed.
-  if (!profile_ || profile_->IsOffTheRecord() || *browser || !process_startup ||
-      SyncPromoUI::GetSyncPromoVersion() != SyncPromoUI::VERSION_DIALOG) {
-    return std::string::npos;
-  }
-
-  for (size_t i = 0; i < tabs->size(); ++i) {
-    GURL url((*tabs)[i].url);
-    if (url.SchemeIs(chrome::kChromeUIScheme) &&
-        url.host() == chrome::kChromeUISyncPromoHost) {
-      SyncPromoDialog dialog(profile_, url);
-      dialog.ShowDialog();
-      *browser = dialog.spawned_browser();
-      if (!*browser) {
-        // If no browser window was spawned then just replace the sync promo
-        // with the next URL.
-        (*tabs)[i].url = SyncPromoUI::GetNextPageURLForSyncPromoURL(url);
-        return i;
-      } else if (dialog.sync_promo_was_closed()) {
-        tabs->erase(tabs->begin() + i);
-        // The tab spawned by the dialog is at tab index 0 so return 0 to make
-        // it the active tab.
-        return 0;
-      } else {
-        // Since the sync promo is not closed it will be inserted at tab
-        // index 0. The tab spawned by the dialog will be at index 1 so return
-        // 0 to make it the active tab.
-        return 1;
-      }
-    }
-  }
-
-  return std::string::npos;
-}
-
 std::vector<GURL> BrowserInit::GetURLsFromCommandLine(
     const CommandLine& command_line,
     const FilePath& cur_dir,
     Profile* profile) {
   std::vector<GURL> urls;
   const CommandLine::StringVector& params = command_line.GetArgs();
 
   for (size_t i = 0; i < params.size(); ++i) {
     FilePath param = FilePath(params[i]);
     // Handle Vista way of searching - "? <search-term>"
@@ skipping 308 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }