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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
350 switches::kExtensionContentVerification, | 350 switches::kExtensionContentVerification, |
351 switches::kExtensionContentVerificationBootstrap }, | 351 switches::kExtensionContentVerificationBootstrap }, |
352 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, | 352 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, |
353 switches::kExtensionContentVerification, | 353 switches::kExtensionContentVerification, |
354 switches::kExtensionContentVerificationEnforce }, | 354 switches::kExtensionContentVerificationEnforce }, |
355 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, | 355 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, |
356 switches::kExtensionContentVerification, | 356 switches::kExtensionContentVerification, |
357 switches::kExtensionContentVerificationEnforceStrict }, | 357 switches::kExtensionContentVerificationEnforceStrict }, |
358 }; | 358 }; |
359 | 359 |
360 const FeatureEntry::Choice kFillOnAccountSelectChoices[] = { | |
361 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
362 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
363 autofill::switches::kDisableFillOnAccountSelect, "" }, | |
364 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING, | |
jochen (gone - plz use gerrit)
2016/06/20 11:34:13
this string is unused now. should it be removed fr
| |
365 autofill::switches::kEnableFillOnAccountSelect, "" }, | |
366 }; | |
367 | |
368 const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { | 360 const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { |
369 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 361 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
370 { IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, | 362 { IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, |
371 switches::kTopChromeMD, | 363 switches::kTopChromeMD, |
372 switches::kTopChromeMDNonMaterial }, | 364 switches::kTopChromeMDNonMaterial }, |
373 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 365 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL, |
374 switches::kTopChromeMD, | 366 switches::kTopChromeMD, |
375 switches::kTopChromeMDMaterial }, | 367 switches::kTopChromeMDMaterial }, |
376 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 368 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, |
377 switches::kTopChromeMD, | 369 switches::kTopChromeMD, |
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1419 #endif // defined(OS_CHROMEOS) | 1411 #endif // defined(OS_CHROMEOS) |
1420 #if defined(OS_ANDROID) | 1412 #if defined(OS_ANDROID) |
1421 {"enable-seccomp-sandbox-android", | 1413 {"enable-seccomp-sandbox-android", |
1422 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, | 1414 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, |
1423 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, kOsAndroid, | 1415 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, kOsAndroid, |
1424 FEATURE_VALUE_TYPE(features::kSeccompSandboxAndroid)}, | 1416 FEATURE_VALUE_TYPE(features::kSeccompSandboxAndroid)}, |
1425 #endif | 1417 #endif |
1426 {"enable-touch-hover", IDS_FLAGS_TOUCH_HOVER_NAME, | 1418 {"enable-touch-hover", IDS_FLAGS_TOUCH_HOVER_NAME, |
1427 IDS_FLAGS_TOUCH_HOVER_DESCRIPTION, kOsAndroid, | 1419 IDS_FLAGS_TOUCH_HOVER_DESCRIPTION, kOsAndroid, |
1428 SINGLE_VALUE_TYPE("enable-touch-hover")}, | 1420 SINGLE_VALUE_TYPE("enable-touch-hover")}, |
1429 {"enable-fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | |
1430 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | |
1431 MULTI_VALUE_TYPE(kFillOnAccountSelectChoices)}, | |
1432 #if defined(OS_CHROMEOS) | 1421 #if defined(OS_CHROMEOS) |
1433 {"enable-wifi-credential-sync", // FLAGS:RECORD_UMA | 1422 {"enable-wifi-credential-sync", // FLAGS:RECORD_UMA |
1434 IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME, | 1423 IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME, |
1435 IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, kOsCrOS, | 1424 IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, kOsCrOS, |
1436 SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)}, | 1425 SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)}, |
1437 {"enable-potentially-annoying-security-features", | 1426 {"enable-potentially-annoying-security-features", |
1438 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, | 1427 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, |
1439 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, | 1428 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, |
1440 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, | 1429 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, |
1441 #endif | 1430 #endif |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1907 IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 1896 IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
1908 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 1897 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
1909 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, | 1898 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, |
1910 switches::kDisableVrShell)}, | 1899 switches::kDisableVrShell)}, |
1911 #endif | 1900 #endif |
1912 | 1901 |
1913 {"enable-weak-memorycache", | 1902 {"enable-weak-memorycache", |
1914 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_NAME, | 1903 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_NAME, |
1915 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_DESCRIPTION, kOsAll, | 1904 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_DESCRIPTION, kOsAll, |
1916 FEATURE_VALUE_TYPE(features::kWeakMemoryCache)}, | 1905 FEATURE_VALUE_TYPE(features::kWeakMemoryCache)}, |
1906 | |
1907 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | |
1908 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | |
1909 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | |
1917 // NOTE: Adding new command-line switches requires adding corresponding | 1910 // NOTE: Adding new command-line switches requires adding corresponding |
1918 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1911 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1919 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1912 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
1920 }; | 1913 }; |
1921 | 1914 |
1922 class FlagsStateSingleton { | 1915 class FlagsStateSingleton { |
1923 public: | 1916 public: |
1924 FlagsStateSingleton() | 1917 FlagsStateSingleton() |
1925 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 1918 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
1926 ~FlagsStateSingleton() {} | 1919 ~FlagsStateSingleton() {} |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2106 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2099 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2107 | 2100 |
2108 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2101 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2109 *count = arraysize(kFeatureEntries); | 2102 *count = arraysize(kFeatureEntries); |
2110 return kFeatureEntries; | 2103 return kFeatureEntries; |
2111 } | 2104 } |
2112 | 2105 |
2113 } // namespace testing | 2106 } // namespace testing |
2114 | 2107 |
2115 } // namespace about_flags | 2108 } // namespace about_flags |
OLD | NEW |