Moving new First Run to use per-profile value, rather than simply checking IsChromeFirstRun.

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/chrome_pages.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.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"
 #endif
 
-StartupTabs StartupTabProviderImpl::GetOnboardingTabs() const {
+StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
 #if defined(OS_WIN)
   // Windows 10 has unique onboarding policies and content.
   if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
     // TODO(tmartino): * Add a function, GetWin10SystemState, which gathers
     //                   system state relevant to Win10 Onboarding and returns
     //                   a struct.
     //                 * Add a function, CheckWin10OnboardingTabPolicy, which
     //                   takes such a struct as input and returns StartupTabs.
     return StartupTabs();
   }
 #endif
 
-  return CheckStandardOnboardingTabPolicy(first_run::IsChromeFirstRun());
+  if (!profile)
+    return StartupTabs();
+
+  PrefService* prefs = profile->GetPrefs();
+  bool has_seen_welcome = prefs && prefs->GetBoolean(prefs::kHasSeenWelcomeUI);
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(profile);
+  bool is_signed_in = signin_manager && signin_manager->IsAuthenticated();
+

[Peter Kasting, 2016/11/20 07:32:09]

Nit: I'd probably remove this blank line since the variables above are defined
solely to be used in this next call

[tmartino, 2016/11/21 00:27:34]

Done

+  return CheckStandardOnboardingTabPolicy(first_run::IsChromeFirstRun(),
+                                          has_seen_welcome, is_signed_in);
 }
 
 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 25 matching lines @@
 
 StartupTabs StartupTabProviderImpl::GetNewTabPageTabs(
     const base::CommandLine& command_line,
     Profile* profile) const {
   return CheckNewTabPageTabPolicy(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
 }
 
 // static
 StartupTabs StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
-    bool is_first_run) {
+    bool is_first_run,
+    bool has_seen_welcome,
+    bool is_signed_in) {
   StartupTabs tabs;
-  if (is_first_run)
-    tabs.emplace_back(GetWelcomePageUrl(), false);
+  if (!has_seen_welcome && !is_signed_in)
+    tabs.emplace_back(GetWelcomePageUrl(!is_first_run), false);
   return tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::CheckMasterPrefsTabPolicy(
     bool is_first_run,
     const std::vector<GURL>& first_run_tabs) {
   // Constants: Magic words used by Master Preferences files in place of a URL
   // host to indicate that internal pages should appear on first run.
   static constexpr char kNewTabUrlHost[] = "new_tab_page";
   static constexpr char kWelcomePageUrlHost[] = "welcome_page";
 
   StartupTabs tabs;
   if (is_first_run) {
     tabs.reserve(first_run_tabs.size());
     for (GURL url : first_run_tabs) {
       if (url.host_piece() == kNewTabUrlHost)
         url = GURL(chrome::kChromeUINewTabURL);
       else if (url.host_piece() == kWelcomePageUrlHost)
-        url = GetWelcomePageUrl();
+        url = GetWelcomePageUrl(false);
       tabs.emplace_back(url, false);
     }
   }
   return tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::CheckResetTriggerTabPolicy(
     bool profile_has_trigger) {
   StartupTabs tabs;
@@ skipping 24 matching lines @@
 // static
 StartupTabs StartupTabProviderImpl::CheckNewTabPageTabPolicy(
     const SessionStartupPref& pref) {
   StartupTabs tabs;
   if (pref.type != SessionStartupPref::Type::LAST)
     tabs.emplace_back(GURL(chrome::kChromeUINewTabURL), false);
   return tabs;
 }
 
 // static
-GURL StartupTabProviderImpl::GetWelcomePageUrl() {
-  return GURL(chrome::kChromeUIWelcomeURL);
+GURL StartupTabProviderImpl::GetWelcomePageUrl(bool use_later_run_variant) {
+  GURL url(chrome::kChromeUIWelcomeURL);
+  return use_later_run_variant
+             ? net::AppendQueryParameter(url, "variant", "everywhere")
+             : url;
 }
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }