Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 2627363002: Enabling new FRE and launch flow by default on Win 10. (Closed)
Patch Set: ChromeOS Unused Function Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 #if defined(OS_WIN) 1221 #if defined(OS_WIN)
1223 TriggeredProfileResetter* triggered_profile_resetter = 1222 TriggeredProfileResetter* triggered_profile_resetter =
1224 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); 1223 TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
1225 // TriggeredProfileResetter instance will be nullptr for incognito profiles. 1224 // TriggeredProfileResetter instance will be nullptr for incognito profiles.
1226 if (triggered_profile_resetter) { 1225 if (triggered_profile_resetter) {
1227 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); 1226 has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
1228 } 1227 }
1229 #endif // defined(OS_WIN) 1228 #endif // defined(OS_WIN)
1230 return has_reset_trigger; 1229 return has_reset_trigger;
1231 } 1230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698