| Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
| diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
|
| index 7e6f18d4370ebb86e8bc51313d97c28f38327c37..2a7851276b078ef78a2de6dec9a67cbf35854375 100644
|
| --- a/chrome/browser/ui/startup/startup_browser_creator.cc
|
| +++ b/chrome/browser/ui/startup/startup_browser_creator.cc
|
| @@ -57,6 +57,7 @@
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
|
| +#include "chrome/browser/ui/startup/startup_features.h"
|
| #include "chrome/browser/ui/user_manager.h"
|
| #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
|
| #include "chrome/common/chrome_constants.h"
|
| @@ -102,6 +103,7 @@
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| +#include "base/win/windows_version.h"
|
| #include "chrome/browser/metrics/jumplist_metrics_win.h"
|
| #endif
|
|
|
| @@ -492,6 +494,15 @@ void StartupBrowserCreator::RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
| }
|
|
|
| // static
|
| +bool StartupBrowserCreator::UseConsolidatedFlow() {
|
| +#if defined(OS_WIN)
|
| + if (base::win::GetVersion() >= base::win::VERSION_WIN10)
|
| + return base::FeatureList::IsEnabled(features::kEnableWelcomeWin10);
|
| +#endif // defined(OS_WIN)
|
| + return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow);
|
| +}
|
| +
|
| +// static
|
| std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
|
| const base::CommandLine& command_line,
|
| const base::FilePath& cur_dir,
|
|
|