Implement Win 10 onboarding content logic

chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 261 matching lines @@
           extension_id, extensions::ExtensionRegistry::EVERYTHING);
   return extension && extension->is_platform_app() ? extension : NULL;
 }
 
 // Appends the contents of |from| to the end of |to|.
 void AppendTabs(const StartupTabs& from, StartupTabs* to) {
   if (!from.empty())
     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 {
 
 GURL GetTriggeredResetSettingsURL() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }
 
 GURL GetWelcomePageURL() {
@@ skipping 66 matching lines @@
   // URLs in that case. The user should see the window as an app,
   // not as chrome.
   // Special case is when app switches are passed but we do want to restore
   // session. In that case open app window + focus it after session is restored.
   if (OpenApplicationWindow(profile)) {
     RecordLaunchModeHistogram(LM_AS_WEBAPP);
   } else {
     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);
 
     if (command_line_.HasSwitch(switches::kInstallChromeApp)) {
       install_chrome_app::InstallChromeApp(
           command_line_.GetSwitchValueASCII(switches::kInstallChromeApp));
     }
 
     // If this is an app launch, but we didn't open an app window, it may
@@ skipping 831 matching lines @@
 #if defined(OS_WIN)
   TriggeredProfileResetter* triggered_profile_resetter =
       TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
   // TriggeredProfileResetter instance will be nullptr for incognito profiles.
   if (triggered_profile_resetter) {
     has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
   }
 #endif  // defined(OS_WIN)
   return has_reset_trigger;
 }