Chromium Code Reviews| 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/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 27 matching lines...) Expand all Loading... | |
| 38 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" | 38 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" |
| 39 #include "components/dom_distiller/core/dom_distiller_switches.h" | 39 #include "components/dom_distiller/core/dom_distiller_switches.h" |
| 40 #include "components/error_page/common/error_page_switches.h" | 40 #include "components/error_page/common/error_page_switches.h" |
| 41 #include "components/flags_ui/feature_entry_macros.h" | 41 #include "components/flags_ui/feature_entry_macros.h" |
| 42 #include "components/flags_ui/flags_storage.h" | 42 #include "components/flags_ui/flags_storage.h" |
| 43 #include "components/flags_ui/flags_ui_switches.h" | 43 #include "components/flags_ui/flags_ui_switches.h" |
| 44 #include "components/nacl/common/nacl_switches.h" | 44 #include "components/nacl/common/nacl_switches.h" |
| 45 #include "components/offline_pages/offline_page_switches.h" | 45 #include "components/offline_pages/offline_page_switches.h" |
| 46 #include "components/omnibox/browser/omnibox_switches.h" | 46 #include "components/omnibox/browser/omnibox_switches.h" |
| 47 #include "components/password_manager/core/common/password_manager_features.h" | 47 #include "components/password_manager/core/common/password_manager_features.h" |
| 48 #include "components/password_manager/core/common/password_manager_switches.h" | |
| 49 #include "components/proximity_auth/switches.h" | 48 #include "components/proximity_auth/switches.h" |
| 50 #include "components/search/search_switches.h" | 49 #include "components/search/search_switches.h" |
| 51 #include "components/security_state/switches.h" | 50 #include "components/security_state/switches.h" |
| 52 #include "components/signin/core/common/signin_switches.h" | 51 #include "components/signin/core/common/signin_switches.h" |
| 53 #include "components/sync_driver/sync_driver_switches.h" | 52 #include "components/sync_driver/sync_driver_switches.h" |
| 54 #include "components/tracing/tracing_switches.h" | 53 #include "components/tracing/tracing_switches.h" |
| 55 #include "components/version_info/version_info.h" | 54 #include "components/version_info/version_info.h" |
| 56 #include "content/public/browser/user_metrics.h" | 55 #include "content/public/browser/user_metrics.h" |
| 57 #include "content/public/common/content_features.h" | 56 #include "content/public/common/content_features.h" |
| 58 #include "content/public/common/content_switches.h" | 57 #include "content/public/common/content_switches.h" |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 348 switches::kExtensionContentVerificationBootstrap }, | 347 switches::kExtensionContentVerificationBootstrap }, |
| 349 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, | 348 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, |
| 350 switches::kExtensionContentVerification, | 349 switches::kExtensionContentVerification, |
| 351 switches::kExtensionContentVerificationEnforce }, | 350 switches::kExtensionContentVerificationEnforce }, |
| 352 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, | 351 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, |
| 353 switches::kExtensionContentVerification, | 352 switches::kExtensionContentVerification, |
| 354 switches::kExtensionContentVerificationEnforceStrict }, | 353 switches::kExtensionContentVerificationEnforceStrict }, |
| 355 }; | 354 }; |
| 356 | 355 |
| 357 const FeatureEntry::Choice kAutofillSyncCredentialChoices[] = { | 356 const FeatureEntry::Choice kAutofillSyncCredentialChoices[] = { |
| 358 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 357 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 359 { IDS_ALLOW_AUTOFILL_SYNC_CREDENTIAL, | 358 {IDS_ALLOW_AUTOFILL_SYNC_CREDENTIAL, |
| 360 password_manager::switches::kAllowAutofillSyncCredential, ""}, | 359 password_manager::features::kAllowAutofillSyncCredential.name, ""}, |
| 361 { IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL_FOR_REAUTH, | 360 {IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL_FOR_REAUTH, |
| 362 password_manager::switches::kDisallowAutofillSyncCredentialForReauth, ""}, | 361 password_manager::features::kDisallowAutofillSyncCredentialForReauth.name, |
| 363 { IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL, | 362 ""}, |
| 364 password_manager::switches::kDisallowAutofillSyncCredential, ""}, | 363 {IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL, |
| 364 password_manager::features::kDisallowAutofillSyncCredential.name, ""}, | |
| 365 }; | 365 }; |
| 366 | 366 |
| 367 const FeatureEntry::Choice kFillOnAccountSelectChoices[] = { | 367 const FeatureEntry::Choice kFillOnAccountSelectChoices[] = { |
| 368 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 368 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 369 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 369 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 370 autofill::switches::kDisableFillOnAccountSelect, "" }, | 370 autofill::switches::kDisableFillOnAccountSelect, "" }, |
| 371 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING, | 371 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING, |
| 372 autofill::switches::kEnableFillOnAccountSelect, "" }, | 372 autofill::switches::kEnableFillOnAccountSelect, "" }, |
| 373 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_NO_HIGHLIGHTING, | 373 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_NO_HIGHLIGHTING, |
| 374 autofill::switches::kEnableFillOnAccountSelectNoHighlighting, "" }, | 374 autofill::switches::kEnableFillOnAccountSelectNoHighlighting, "" }, |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1050 IDS_FLAGS_PASSWORD_FORCE_SAVING_NAME, | 1050 IDS_FLAGS_PASSWORD_FORCE_SAVING_NAME, |
| 1051 IDS_FLAGS_PASSWORD_FORCE_SAVING_DESCRIPTION, | 1051 IDS_FLAGS_PASSWORD_FORCE_SAVING_DESCRIPTION, |
| 1052 kOsAll, | 1052 kOsAll, |
| 1053 FEATURE_VALUE_TYPE( | 1053 FEATURE_VALUE_TYPE( |
| 1054 password_manager::features::kEnablePasswordForceSaving)}, | 1054 password_manager::features::kEnablePasswordForceSaving)}, |
| 1055 {"enable-affiliation-based-matching", | 1055 {"enable-affiliation-based-matching", |
| 1056 IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME, | 1056 IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME, |
| 1057 IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION, | 1057 IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION, |
| 1058 kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid, | 1058 kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid, |
| 1059 ENABLE_DISABLE_VALUE_TYPE( | 1059 ENABLE_DISABLE_VALUE_TYPE( |
| 1060 password_manager::switches::kEnableAffiliationBasedMatching, | 1060 password_manager::features::kEnableAffiliationBasedMatching.name, |
| 1061 password_manager::switches::kDisableAffiliationBasedMatching)}, | 1061 password_manager::features::kDisableAffiliationBasedMatching.name)}, |
|
Alexei Svitkine (slow)
2016/02/09 16:30:33
Yeah, this doesn't make sense.
First, there shoul
Pritam Nikam
2016/02/11 10:51:58
Done.
| |
| 1062 {"wallet-service-use-sandbox", | 1062 {"wallet-service-use-sandbox", |
| 1063 IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME, | 1063 IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME, |
| 1064 IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION, | 1064 IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION, |
| 1065 kOsAndroid | kOsDesktop, | 1065 kOsAndroid | kOsDesktop, |
| 1066 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1066 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1067 autofill::switches::kWalletServiceUseSandbox, | 1067 autofill::switches::kWalletServiceUseSandbox, |
| 1068 "1", | 1068 "1", |
| 1069 autofill::switches::kWalletServiceUseSandbox, | 1069 autofill::switches::kWalletServiceUseSandbox, |
| 1070 "0")}, | 1070 "0")}, |
| 1071 #if defined(USE_AURA) | 1071 #if defined(USE_AURA) |
| (...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1604 IDS_FLAGS_WEB_APP_FRAME_NAME, | 1604 IDS_FLAGS_WEB_APP_FRAME_NAME, |
| 1605 IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, | 1605 IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, |
| 1606 kOsWin | kOsCrOS, | 1606 kOsWin | kOsCrOS, |
| 1607 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)}, | 1607 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)}, |
| 1608 #endif | 1608 #endif |
| 1609 {"enable-drop-sync-credential", | 1609 {"enable-drop-sync-credential", |
| 1610 IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, | 1610 IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, |
| 1611 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, | 1611 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, |
| 1612 kOsAll, | 1612 kOsAll, |
| 1613 ENABLE_DISABLE_VALUE_TYPE( | 1613 ENABLE_DISABLE_VALUE_TYPE( |
| 1614 password_manager::switches::kEnableDropSyncCredential, | 1614 password_manager::features::kEnableDropSyncCredential.name, |
| 1615 password_manager::switches::kDisableDropSyncCredential)}, | 1615 password_manager::features::kDisableDropSyncCredential.name)}, |
| 1616 #if defined(ENABLE_EXTENSIONS) | 1616 #if defined(ENABLE_EXTENSIONS) |
| 1617 {"enable-extension-action-redesign", | 1617 {"enable-extension-action-redesign", |
| 1618 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, | 1618 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, |
| 1619 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, | 1619 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, |
| 1620 kOsDesktop, | 1620 kOsDesktop, |
| 1621 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, | 1621 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, |
| 1622 #endif | 1622 #endif |
| 1623 {"autofill-sync-credential", | 1623 {"autofill-sync-credential", |
| 1624 IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME, | 1624 IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME, |
| 1625 IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, | 1625 IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2382 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2382 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2383 | 2383 |
| 2384 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2384 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2385 *count = arraysize(kFeatureEntries); | 2385 *count = arraysize(kFeatureEntries); |
| 2386 return kFeatureEntries; | 2386 return kFeatureEntries; |
| 2387 } | 2387 } |
| 2388 | 2388 |
| 2389 } // namespace testing | 2389 } // namespace testing |
| 2390 | 2390 |
| 2391 } // namespace about_flags | 2391 } // namespace about_flags |
| OLD | NEW |