Implement Win 10 onboarding content logic

chrome/browser/ui/startup/startup_browser_creator_impl.cc

Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index b088b9649494180310c986925cd95a41dc6064cb..12315fa95ec2151b7f9e6f83390b9c36d35f3602 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -279,18 +279,6 @@ void AppendTabs(const StartupTabs& from, StartupTabs* to) {
     to->insert(to->end(), from.begin(), from.end());
 }
 
-// Determines whether the Consolidated startup flow should be used, based on
-// OS, OS version, and the kUseConsolidatedStartupFlow Feature.
-bool UseConsolidatedFlow() {

[tmartino, 2016/12/15 19:00:10]

Whoops, one more thing. We haven't launch-reviewed this, so we don't want to
couple the Win 10 and non-Win 10 launches. We'll have to add another Finch
feature controlling the behavior on Win10.

Let's put this function back in, and either add a new feature to
startup_features.h controlling the Win 10 behavior, or just leave it as false
and we can add the feature in a followup CL.

[Patrick Monette, 2016/12/15 20:17:35]

Done.

-#if defined(OS_WIN)
-  // TODO(tmartino): Enable for Windows 10+ once relevant Win 10-specific logic
-  // is added to StartupTabProvider.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN10)
-    return false;
-#endif  // defined(OS_WIN)
-  return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow);
-}
-
 }  // namespace
 
 namespace internals {
@@ -377,7 +365,7 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
     RecordLaunchModeHistogram(urls_to_open.empty() ?
                               LM_TO_BE_DECIDED : LM_WITH_URLS);
 
-    if (UseConsolidatedFlow())
+    if (base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow))
       ProcessLaunchUrlsUsingConsolidatedFlow(process_startup, urls_to_open);
     else
       ProcessLaunchURLs(process_startup, urls_to_open);