| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 // Appends the contents of |from| to the end of |to|. | 277 // Appends the contents of |from| to the end of |to|. |
| 278 void AppendTabs(const StartupTabs& from, StartupTabs* to) { | 278 void AppendTabs(const StartupTabs& from, StartupTabs* to) { |
| 279 if (!from.empty()) | 279 if (!from.empty()) |
| 280 to->insert(to->end(), from.begin(), from.end()); | 280 to->insert(to->end(), from.begin(), from.end()); |
| 281 } | 281 } |
| 282 | 282 |
| 283 // Determines whether the Consolidated startup flow should be used, based on | 283 // Determines whether the Consolidated startup flow should be used, based on |
| 284 // the kUseConsolidatedStartupFlow Feature. Not enabled on Windows 10+. | 284 // the kUseConsolidatedStartupFlow Feature. Not enabled on Windows 10+. |
| 285 bool UseConsolidatedFlow() { | 285 bool UseConsolidatedFlow() { |
| 286 #if defined(OS_WIN) | 286 #if defined(OS_WIN) |
| 287 // TODO(tmartino): Add a Win10+ specific experiment. | |
| 288 if (base::win::GetVersion() >= base::win::VERSION_WIN10) | 287 if (base::win::GetVersion() >= base::win::VERSION_WIN10) |
| 289 return false; | 288 return base::FeatureList::IsEnabled(features::kEnableWelcomeWin10); |
| 290 #endif // defined(OS_WIN) | 289 #endif // defined(OS_WIN) |
| 291 return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow); | 290 return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow); |
| 292 } | 291 } |
| 293 | 292 |
| 294 } // namespace | 293 } // namespace |
| 295 | 294 |
| 296 namespace internals { | 295 namespace internals { |
| 297 | 296 |
| 298 GURL GetTriggeredResetSettingsURL() { | 297 GURL GetTriggeredResetSettingsURL() { |
| 299 return GURL( | 298 return GURL( |
| (...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 #if defined(OS_WIN) | 1223 #if defined(OS_WIN) |
| 1225 TriggeredProfileResetter* triggered_profile_resetter = | 1224 TriggeredProfileResetter* triggered_profile_resetter = |
| 1226 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); | 1225 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); |
| 1227 // TriggeredProfileResetter instance will be nullptr for incognito profiles. | 1226 // TriggeredProfileResetter instance will be nullptr for incognito profiles. |
| 1228 if (triggered_profile_resetter) { | 1227 if (triggered_profile_resetter) { |
| 1229 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); | 1228 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); |
| 1230 } | 1229 } |
| 1231 #endif // defined(OS_WIN) | 1230 #endif // defined(OS_WIN) |
| 1232 return has_reset_trigger; | 1231 return has_reset_trigger; |
| 1233 } | 1232 } |
| OLD | NEW |