| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 return extension && extension->is_platform_app() ? extension : NULL; | 272 return extension && extension->is_platform_app() ? extension : NULL; |
| 273 } | 273 } |
| 274 | 274 |
| 275 // Appends the contents of |from| to the end of |to|. | 275 // Appends the contents of |from| to the end of |to|. |
| 276 void AppendTabs(const StartupTabs& from, StartupTabs* to) { | 276 void AppendTabs(const StartupTabs& from, StartupTabs* to) { |
| 277 if (!from.empty()) | 277 if (!from.empty()) |
| 278 to->insert(to->end(), from.begin(), from.end()); | 278 to->insert(to->end(), from.begin(), from.end()); |
| 279 } | 279 } |
| 280 | 280 |
| 281 // Determines whether the Consolidated startup flow should be used, based on | 281 // Determines whether the Consolidated startup flow should be used, based on |
| 282 // OS, OS version, and the kUseConsolidatedStartupFlow Feature. | 282 // the kUseConsolidatedStartupFlow Feature. Not enabled on Windows 10+. |
| 283 bool UseConsolidatedFlow() { | 283 bool UseConsolidatedFlow() { |
| 284 #if defined(OS_WIN) | 284 #if defined(OS_WIN) |
| 285 // TODO(tmartino): Enable for Windows 10+ once relevant Win 10-specific logic | 285 // TODO(tmartino): Add a Win10+ specific experiment. |
| 286 // is added to StartupTabProvider. | |
| 287 if (base::win::GetVersion() >= base::win::VERSION_WIN10) | 286 if (base::win::GetVersion() >= base::win::VERSION_WIN10) |
| 288 return false; | 287 return false; |
| 289 #endif // defined(OS_WIN) | 288 #endif // defined(OS_WIN) |
| 290 return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow); | 289 return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow); |
| 291 } | 290 } |
| 292 | 291 |
| 293 } // namespace | 292 } // namespace |
| 294 | 293 |
| 295 namespace internals { | 294 namespace internals { |
| 296 | 295 |
| (...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1221 #if defined(OS_WIN) | 1220 #if defined(OS_WIN) |
| 1222 TriggeredProfileResetter* triggered_profile_resetter = | 1221 TriggeredProfileResetter* triggered_profile_resetter = |
| 1223 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); | 1222 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); |
| 1224 // TriggeredProfileResetter instance will be nullptr for incognito profiles. | 1223 // TriggeredProfileResetter instance will be nullptr for incognito profiles. |
| 1225 if (triggered_profile_resetter) { | 1224 if (triggered_profile_resetter) { |
| 1226 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); | 1225 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); |
| 1227 } | 1226 } |
| 1228 #endif // defined(OS_WIN) | 1227 #endif // defined(OS_WIN) |
| 1229 return has_reset_trigger; | 1228 return has_reset_trigger; |
| 1230 } | 1229 } |
| OLD | NEW |