[uber] Redoing the homepage selection UI

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 "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 726 matching lines @@
   if (command_line.HasSwitch(switches::kRestoreLastSession) ||
       BrowserInit::WasRestarted()) {
     pref.type = SessionStartupPref::LAST;
   }
   if (pref.type == SessionStartupPref::LAST &&
       IncognitoModePrefs::ShouldLaunchIncognito(command_line,
                                                 profile->GetPrefs())) {
     // We don't store session information when incognito. If the user has
     // chosen to restore last session and launched incognito, fallback to
     // default launch behavior.
-    pref.type = SessionStartupPref::DEFAULT;
+    pref.type = SessionStartupPref::NEWTAB;
   }
   return pref;
 }
 
 
 // BrowserInit::LaunchWithProfile::Tab ----------------------------------------
 
 BrowserInit::LaunchWithProfile::Tab::Tab() : is_app(false), is_pinned(true) {}
 
 BrowserInit::LaunchWithProfile::Tab::~Tab() {}
@@ skipping 272 matching lines @@
   if (process_startup)
     AddInfoBarsIfNecessary(browser);
 }
 
 bool BrowserInit::LaunchWithProfile::ProcessStartupURLs(
     const std::vector<GURL>& urls_to_open) {
   SessionStartupPref pref = GetSessionStartupPref(command_line_, profile_);
   if (command_line_.HasSwitch(switches::kTestingChannelID) &&
       !command_line_.HasSwitch(switches::kRestoreLastSession) &&
       browser_defaults::kDefaultSessionStartupType !=
-      SessionStartupPref::DEFAULT) {
+      SessionStartupPref::NEWTAB) {
     // When we have non DEFAULT session start type, then we won't open up a
     // fresh session. But none of the tests are written with this in mind, so
     // we explicitly ignore it during testing.
     return false;
   }
 
   if (pref.type == SessionStartupPref::LAST) {
     if (!profile_->DidLastSessionExitCleanly() &&
         !command_line_.HasSwitch(switches::kRestoreLastSession)) {
       // The last session crashed. It's possible automatically loading the
@@ skipping 45 matching lines @@
   RecordAppLaunches(profile_, urls_to_open, tabs);
 
   if (!urls_to_open.empty()) {
     // If urls were specified on the command line, use them.
     UrlsToTabs(urls_to_open, &tabs);
   } else if (pref.type == SessionStartupPref::URLS && !pref.urls.empty()) {
     // Only use the set of urls specified in preferences if nothing was
     // specified on the command line. Filter out any urls that are to be
     // restored by virtue of having been previously pinned.
     AddUniqueURLs(pref.urls, &tabs);
-  } else if (pref.type == SessionStartupPref::DEFAULT && !tabs.empty()) {
-    // Make sure the home page is opened even if there are pinned tabs.
-    std::vector<GURL> urls;
-    AddStartupURLs(&urls);
-    UrlsToTabs(urls, &tabs);
+  } else if (pref.type == SessionStartupPref::NEWTAB) {
+    BrowserInit::LaunchWithProfile::Tab tab;
+    tab.is_pinned = false;
+    tab.url = GURL(chrome::kChromeUINewTabURL);
+    tabs.push_back(tab);
+  } else if (pref.type == SessionStartupPref::HOMEPAGE) {
+    // If the user had 'homepage' selected, we should have migrated
+    // them to 'URLS' instead.
+    DLOG(ERROR) << "pref.type == HOMEPAGE";
+    NOTREACHED();
   }
 
   if (tabs.empty())
     return NULL;
 
   Browser* browser = OpenTabsInBrowser(NULL, true, tabs);
   return browser;
 }
 
 void BrowserInit::LaunchWithProfile::AddUniqueURLs(
@@ skipping 648 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);
 }