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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2946693002: Use GN buildflags and features to configure account consistency (Closed)
Patch Set: fix Created 3 years, 6 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
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/signin/chrome_signin_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "components/ntp_tiles/constants.h" 59 #include "components/ntp_tiles/constants.h"
60 #include "components/ntp_tiles/switches.h" 60 #include "components/ntp_tiles/switches.h"
61 #include "components/offline_pages/core/offline_page_feature.h" 61 #include "components/offline_pages/core/offline_page_feature.h"
62 #include "components/omnibox/browser/omnibox_field_trial.h" 62 #include "components/omnibox/browser/omnibox_field_trial.h"
63 #include "components/omnibox/browser/omnibox_switches.h" 63 #include "components/omnibox/browser/omnibox_switches.h"
64 #include "components/password_manager/core/common/password_manager_features.h" 64 #include "components/password_manager/core/common/password_manager_features.h"
65 #include "components/previews/core/previews_features.h" 65 #include "components/previews/core/previews_features.h"
66 #include "components/proximity_auth/switches.h" 66 #include "components/proximity_auth/switches.h"
67 #include "components/security_state/core/security_state.h" 67 #include "components/security_state/core/security_state.h"
68 #include "components/security_state/core/switches.h" 68 #include "components/security_state/core/switches.h"
69 #include "components/signin/core/common/signin_features.h"
69 #include "components/signin/core/common/signin_switches.h" 70 #include "components/signin/core/common/signin_switches.h"
70 #include "components/spellcheck/common/spellcheck_features.h" 71 #include "components/spellcheck/common/spellcheck_features.h"
71 #include "components/spellcheck/common/spellcheck_switches.h" 72 #include "components/spellcheck/common/spellcheck_switches.h"
72 #include "components/spellcheck/spellcheck_build_features.h" 73 #include "components/spellcheck/spellcheck_build_features.h"
73 #include "components/ssl_config/ssl_config_switches.h" 74 #include "components/ssl_config/ssl_config_switches.h"
74 #include "components/suggestions/features.h" 75 #include "components/suggestions/features.h"
75 #include "components/sync/driver/sync_driver_switches.h" 76 #include "components/sync/driver/sync_driver_switches.h"
76 #include "components/tracing/common/tracing_switches.h" 77 #include "components/tracing/common/tracing_switches.h"
77 #include "components/translate/core/browser/translate_infobar_delegate.h" 78 #include "components/translate/core/browser/translate_infobar_delegate.h"
78 #include "components/translate/core/browser/translate_manager.h" 79 #include "components/translate/core/browser/translate_manager.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 299 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
299 {flag_descriptions::kDefaultTileHeightShort, switches::kDefaultTileHeight, 300 {flag_descriptions::kDefaultTileHeightShort, switches::kDefaultTileHeight,
300 "128"}, 301 "128"},
301 {flag_descriptions::kDefaultTileHeightTall, switches::kDefaultTileHeight, 302 {flag_descriptions::kDefaultTileHeightTall, switches::kDefaultTileHeight,
302 "256"}, 303 "256"},
303 {flag_descriptions::kDefaultTileHeightGrande, switches::kDefaultTileHeight, 304 {flag_descriptions::kDefaultTileHeightGrande, switches::kDefaultTileHeight,
304 "512"}, 305 "512"},
305 {flag_descriptions::kDefaultTileHeightVenti, switches::kDefaultTileHeight, 306 {flag_descriptions::kDefaultTileHeightVenti, switches::kDefaultTileHeight,
306 "1024"}}; 307 "1024"}};
307 308
308 #if !defined(OS_ANDROID) 309 #if !BUILDFLAG(ENABLE_MIRROR)
309 const FeatureEntry::Choice kAccountConsistencyChoices[] = { 310 const FeatureEntry::Choice kAccountConsistencyChoices[] = {
310 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 311 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
311 {flag_descriptions::kAccountConsistencyChoiceMirror, 312 {flag_descriptions::kAccountConsistencyChoiceMirror,
312 switches::kAccountConsistency, switches ::kAccountConsistencyMirror}, 313 switches::kAccountConsistency, switches ::kAccountConsistencyMirror},
314 #if BUILDFLAG(ENABLE_DICE_SUPPORT)
313 {flag_descriptions::kAccountConsistencyChoiceDice, 315 {flag_descriptions::kAccountConsistencyChoiceDice,
314 switches::kAccountConsistency, switches::kAccountConsistencyDice}, 316 switches::kAccountConsistency, switches::kAccountConsistencyDice},
317 #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
315 }; 318 };
316 #endif 319 #endif // !BUILDFLAG(ENABLE_MIRROR)
317 320
318 const FeatureEntry::Choice kSimpleCacheBackendChoices[] = { 321 const FeatureEntry::Choice kSimpleCacheBackendChoices[] = {
319 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 322 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
320 {flags_ui::kGenericExperimentChoiceDisabled, 323 {flags_ui::kGenericExperimentChoiceDisabled,
321 switches::kUseSimpleCacheBackend, "off"}, 324 switches::kUseSimpleCacheBackend, "off"},
322 {flags_ui::kGenericExperimentChoiceEnabled, 325 {flags_ui::kGenericExperimentChoiceEnabled,
323 switches::kUseSimpleCacheBackend, "on"}}; 326 switches::kUseSimpleCacheBackend, "on"}};
324 327
325 #if defined(OS_ANDROID) 328 #if defined(OS_ANDROID)
326 const FeatureEntry::Choice kReaderModeHeuristicsChoices[] = { 329 const FeatureEntry::Choice kReaderModeHeuristicsChoices[] = {
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 {"enable-spelling-feedback-field-trial", 1667 {"enable-spelling-feedback-field-trial",
1665 flag_descriptions::kSpellingFeedbackFieldTrialName, 1668 flag_descriptions::kSpellingFeedbackFieldTrialName,
1666 flag_descriptions::kSpellingFeedbackFieldTrialDescription, kOsAll, 1669 flag_descriptions::kSpellingFeedbackFieldTrialDescription, kOsAll,
1667 SINGLE_VALUE_TYPE( 1670 SINGLE_VALUE_TYPE(
1668 spellcheck::switches::kEnableSpellingFeedbackFieldTrial)}, 1671 spellcheck::switches::kEnableSpellingFeedbackFieldTrial)},
1669 #endif // ENABLE_SPELLCHECK 1672 #endif // ENABLE_SPELLCHECK
1670 {"enable-webgl-draft-extensions", 1673 {"enable-webgl-draft-extensions",
1671 flag_descriptions::kWebglDraftExtensionsName, 1674 flag_descriptions::kWebglDraftExtensionsName,
1672 flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, 1675 flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
1673 SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)}, 1676 SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)},
1674 #if !defined(OS_ANDROID) 1677 #if !BUILDFLAG(ENABLE_MIRROR)
1675 {"account-consistency", flag_descriptions::kAccountConsistencyName, 1678 {"account-consistency", flag_descriptions::kAccountConsistencyName,
1676 flag_descriptions::kAccountConsistencyDescription, 1679 flag_descriptions::kAccountConsistencyDescription, kOsAll,
1677 kOsWin | kOsLinux | kOsMac, MULTI_VALUE_TYPE(kAccountConsistencyChoices)}, 1680 MULTI_VALUE_TYPE(kAccountConsistencyChoices)},
1678 #endif 1681 #endif
1679 #if BUILDFLAG(ENABLE_APP_LIST) 1682 #if BUILDFLAG(ENABLE_APP_LIST)
1680 {"reset-app-list-install-state", 1683 {"reset-app-list-install-state",
1681 flag_descriptions::kResetAppListInstallStateName, 1684 flag_descriptions::kResetAppListInstallStateName,
1682 flag_descriptions::kResetAppListInstallStateDescription, 1685 flag_descriptions::kResetAppListInstallStateDescription,
1683 kOsMac | kOsWin | kOsLinux, 1686 kOsMac | kOsWin | kOsLinux,
1684 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, 1687 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)},
1685 #endif // BUILDFLAG(ENABLE_APP_LIST) 1688 #endif // BUILDFLAG(ENABLE_APP_LIST)
1686 #if defined(OS_ANDROID) 1689 #if defined(OS_ANDROID)
1687 {"enable-special-locale", flag_descriptions::kEnableSpecialLocaleName, 1690 {"enable-special-locale", flag_descriptions::kEnableSpecialLocaleName,
(...skipping 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after
3314 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3317 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3315 3318
3316 const FeatureEntry* GetFeatureEntries(size_t* count) { 3319 const FeatureEntry* GetFeatureEntries(size_t* count) {
3317 *count = arraysize(kFeatureEntries); 3320 *count = arraysize(kFeatureEntries);
3318 return kFeatureEntries; 3321 return kFeatureEntries;
3319 } 3322 }
3320 3323
3321 } // namespace testing 3324 } // namespace testing
3322 3325
3323 } // namespace about_flags 3326 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/signin/chrome_signin_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698