Enabling kUseConsolidatedStartupFlow by default on trunk.

chrome/browser/ui/startup/startup_tab_provider.cc

 // Copyright 2016 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/startup/startup_tab_provider.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_integration.h"
 #endif
 
 StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
+// Onboarding content has not been launched on Chrome OS.
+#if defined(OS_CHROMEOS)
+  return StartupTabs();
+#else
   if (!profile)
     return StartupTabs();
 
   bool is_first_run = first_run::IsChromeFirstRun();
   PrefService* prefs = profile->GetPrefs();
   bool has_seen_welcome_page =
       prefs && prefs->GetBoolean(prefs::kHasSeenWelcomePage);
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   bool is_signed_in = signin_manager && signin_manager->IsAuthenticated();
 
 #if defined(OS_WIN)
   // Windows 10 has unique onboarding policies and content.
   if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
     PrefService* local_state = g_browser_process->local_state();
     bool has_seen_win10_promo =
         local_state && local_state->GetBoolean(prefs::kHasSeenWin10PromoPage);
     bool is_default_browser =
         g_browser_process->CachedDefaultWebClientState() ==
         shell_integration::IS_DEFAULT;
     return CheckWin10OnboardingTabPolicy(is_first_run, has_seen_welcome_page,
                                          has_seen_win10_promo, is_signed_in,
                                          is_default_browser);
   }
-#endif
+#endif  // defined(OS_WIN)
 
   return CheckStandardOnboardingTabPolicy(is_first_run, has_seen_welcome_page,
                                           is_signed_in);
+#endif  // defined(OS_CHROMEOS)
 }
 
 StartupTabs StartupTabProviderImpl::GetDistributionFirstRunTabs(
     StartupBrowserCreator* browser_creator) const {
   if (!browser_creator)
     return StartupTabs();
   StartupTabs tabs = CheckMasterPrefsTabPolicy(
       first_run::IsChromeFirstRun(), browser_creator->first_run_tabs_);
   browser_creator->first_run_tabs_.clear();
   return tabs;
@@ skipping 12 matching lines @@
     const base::CommandLine& command_line,
     Profile* profile) const {
   return CheckPinnedTabPolicy(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
       PinnedTabCodec::ReadPinnedTabs(profile));
 }
 
 StartupTabs StartupTabProviderImpl::GetPreferencesTabs(
     const base::CommandLine& command_line,
     Profile* profile) const {
+  // Attempt to find an existing, non-empty tabbed browser for this profile. If
+  // one exists, preferences tabs are not used.
+  BrowserList* browser_list = BrowserList::GetInstance();
+  auto other_tabbed_browser = std::find_if(
+      browser_list->begin(), browser_list->end(), [profile](Browser* browser) {
+        return browser->profile() == profile && browser->is_type_tabbed() &&
+               !browser->tab_strip_model()->empty();
+      });
+  bool profile_has_other_tabbed_browser =
+      other_tabbed_browser != browser_list->end();
+
   return CheckPreferencesTabPolicy(
-      StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
+      StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
+      profile_has_other_tabbed_browser);
 }
 
 StartupTabs StartupTabProviderImpl::GetNewTabPageTabs(
     const base::CommandLine& command_line,
     Profile* profile) const {
   return CheckNewTabPageTabPolicy(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
 }
 
 // static
@@ skipping 59 matching lines @@
 // static
 StartupTabs StartupTabProviderImpl::CheckPinnedTabPolicy(
     const SessionStartupPref& pref,
     const StartupTabs& pinned_tabs) {
   return (pref.type == SessionStartupPref::Type::LAST) ? StartupTabs()
                                                        : pinned_tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::CheckPreferencesTabPolicy(
-    const SessionStartupPref& pref) {
+    const SessionStartupPref& pref,
+    bool profile_has_other_tabbed_browser) {
   StartupTabs tabs;
-  if (pref.type == SessionStartupPref::Type::URLS && !pref.urls.empty()) {
+  if (pref.type == SessionStartupPref::Type::URLS && !pref.urls.empty() &&
+      !profile_has_other_tabbed_browser) {
     for (const auto& url : pref.urls)
       tabs.push_back(StartupTab(url, false));
   }
   return tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::CheckNewTabPageTabPolicy(
     const SessionStartupPref& pref) {
   StartupTabs tabs;
@@ skipping 19 matching lines @@
              ? net::AppendQueryParameter(url, "text", "faster")
              : url;
 }
 #endif
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }