Sync Promo: Tweak first tabs

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 1270 matching lines @@
     startup_urls->push_back(GURL());  // New tab page.
     PrefService* prefs = g_browser_process->local_state();
     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 replace the first
-  // startup URL with the sync promo page.
+  // If the sync promo page is going to be displayed then insert it at the front
+  // of the list.
   if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) {
     SyncPromoUI::DidShowSyncPromoAtStartup(profile_);
-    (*startup_urls)[0] = SyncPromoUI::GetSyncPromoURL((*startup_urls)[0], true);
+    GURL old_url = (*startup_urls)[0];
+    (*startup_urls)[0] =
+        SyncPromoUI::GetSyncPromoURL(GURL(chrome::kChromeUINewTabURL), true);
+
+    // 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);
+    }
   }
 }
 
 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 221 matching lines @@
   if (!automation->InitializeChannel(channel_id))
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }