Do not show pinned tabs on multiple instances

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 "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
@@ skipping 11 matching lines @@
 #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
 
+namespace {
+
+// Attempts to find an existing, non-empty tabbed browser for this profile.
+bool ProfileHasOtherTabbedBrowser(Profile* profile) {
+  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();
+      });
+  return other_tabbed_browser != browser_list->end();
+}
+
+}  // namespace
+
 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();
@@ skipping 52 matching lines @@
   bool has_reset_trigger = triggered_profile_resetter &&
                            triggered_profile_resetter->HasResetTrigger();
   return GetResetTriggerTabsForState(has_reset_trigger);
 }
 
 StartupTabs StartupTabProviderImpl::GetPinnedTabs(
     const base::CommandLine& command_line,
     Profile* profile) const {
   return GetPinnedTabsForState(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
-      PinnedTabCodec::ReadPinnedTabs(profile));
+      PinnedTabCodec::ReadPinnedTabs(profile),
+      ProfileHasOtherTabbedBrowser(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 GetPreferencesTabsForState(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
-      profile_has_other_tabbed_browser);
+      ProfileHasOtherTabbedBrowser(profile));
 }
 
 StartupTabs StartupTabProviderImpl::GetNewTabPageTabs(
     const base::CommandLine& command_line,
     Profile* profile) const {
   return GetNewTabPageTabsForState(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
 }
 
 // static
@@ skipping 61 matching lines @@
     bool profile_has_trigger) {
   StartupTabs tabs;
   if (profile_has_trigger)
     tabs.emplace_back(GetTriggeredResetSettingsUrl(), false);
   return tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::GetPinnedTabsForState(
     const SessionStartupPref& pref,
-    const StartupTabs& pinned_tabs) {
-  return (pref.type == SessionStartupPref::Type::LAST) ? StartupTabs()
-                                                       : pinned_tabs;
+    const StartupTabs& pinned_tabs,
+    bool profile_has_other_tabbed_browser) {
+  if (pref.type == SessionStartupPref::Type::LAST ||
+      profile_has_other_tabbed_browser)
+    return StartupTabs();
+  return pinned_tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::GetPreferencesTabsForState(
     const SessionStartupPref& pref,
     bool profile_has_other_tabbed_browser) {
   StartupTabs tabs;
   if (pref.type == SessionStartupPref::Type::URLS && !pref.urls.empty() &&
       !profile_has_other_tabbed_browser) {
     for (const auto& url : pref.urls)
@@ skipping 30 matching lines @@
              ? net::AppendQueryParameter(url, "text", "faster")
              : url;
 }
 #endif
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }