| 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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 610 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
| 611 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, | 611 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, |
| 612 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, | 612 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, |
| 613 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 613 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
| 614 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 614 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
| 615 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 615 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
| 616 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 616 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
| 617 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 617 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
| 618 #endif | 618 #endif |
| 619 #if defined(OS_ANDROID) | 619 #if defined(OS_ANDROID) |
| 620 {"enable-osk-overscroll", | 620 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
| 621 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, | 621 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, |
| 622 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, | |
| 623 kOsAndroid, | |
| 624 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 622 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
| 625 #endif | 623 #endif |
| 626 // Native client is compiled out when DISABLE_NACL is defined. | 624 // Native client is compiled out when DISABLE_NACL is defined. |
| 627 #if !defined(DISABLE_NACL) | 625 #if !defined(DISABLE_NACL) |
| 628 {"enable-nacl", // FLAGS:RECORD_UMA | 626 {"enable-nacl", // FLAGS:RECORD_UMA |
| 629 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 627 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
| 630 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 628 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
| 631 {"enable-nacl-debug", // FLAGS:RECORD_UMA | 629 {"enable-nacl-debug", // FLAGS:RECORD_UMA |
| 632 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 630 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
| 633 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 631 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, |
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1437 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, | 1435 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, |
| 1438 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, | 1436 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, |
| 1439 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, | 1437 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, |
| 1440 #endif | 1438 #endif |
| 1441 {"mark-non-secure-as", // FLAGS:RECORD_UMA | 1439 {"mark-non-secure-as", // FLAGS:RECORD_UMA |
| 1442 IDS_MARK_NON_SECURE_AS_NAME, IDS_MARK_NON_SECURE_AS_DESCRIPTION, kOsAll, | 1440 IDS_MARK_NON_SECURE_AS_NAME, IDS_MARK_NON_SECURE_AS_DESCRIPTION, kOsAll, |
| 1443 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)}, | 1441 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)}, |
| 1444 {"enable-site-per-process", IDS_FLAGS_SITE_PER_PROCESS_NAME, | 1442 {"enable-site-per-process", IDS_FLAGS_SITE_PER_PROCESS_NAME, |
| 1445 IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION, kOsAll, | 1443 IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION, kOsAll, |
| 1446 SINGLE_VALUE_TYPE(switches::kSitePerProcess)}, | 1444 SINGLE_VALUE_TYPE(switches::kSitePerProcess)}, |
| 1445 {"enable-top-document-isolation", IDS_FLAGS_TOP_DOCUMENT_ISOLATION_NAME, |
| 1446 IDS_FLAGS_TOP_DOCUMENT_ISOLATION_DESCRIPTION, kOsAll, |
| 1447 SINGLE_VALUE_TYPE(switches::kTopDocumentIsolation)}, |
| 1447 {"enable-use-zoom-for-dsf", IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_NAME, | 1448 {"enable-use-zoom-for-dsf", IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_NAME, |
| 1448 IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_DESCRIPTION, kOsDesktop, | 1449 IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_DESCRIPTION, kOsDesktop, |
| 1449 MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)}, | 1450 MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)}, |
| 1450 #if defined(OS_MACOSX) | 1451 #if defined(OS_MACOSX) |
| 1451 {"enable-harfbuzz-rendertext", IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, | 1452 {"enable-harfbuzz-rendertext", IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, |
| 1452 IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, kOsMac, | 1453 IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, kOsMac, |
| 1453 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)}, | 1454 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)}, |
| 1454 #endif // defined(OS_MACOSX) | 1455 #endif // defined(OS_MACOSX) |
| 1455 #if defined(OS_CHROMEOS) | 1456 #if defined(OS_CHROMEOS) |
| 1456 {"disable-timezone-tracking", | 1457 {"disable-timezone-tracking", |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1821 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_NAME, | 1822 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_NAME, |
| 1822 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_DESCRIPTION, kOsAll, | 1823 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_DESCRIPTION, kOsAll, |
| 1823 FEATURE_VALUE_TYPE( | 1824 FEATURE_VALUE_TYPE( |
| 1824 password_manager::features::kProtectSyncCredentialOnReauth)}, | 1825 password_manager::features::kProtectSyncCredentialOnReauth)}, |
| 1825 #if defined(OS_CHROMEOS) | 1826 #if defined(OS_CHROMEOS) |
| 1826 {"enable-experimental-accessibility-features", | 1827 {"enable-experimental-accessibility-features", |
| 1827 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME, | 1828 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME, |
| 1828 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS, | 1829 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS, |
| 1829 SINGLE_VALUE_TYPE( | 1830 SINGLE_VALUE_TYPE( |
| 1830 chromeos::switches::kEnableExperimentalAccessibilityFeatures)}, | 1831 chromeos::switches::kEnableExperimentalAccessibilityFeatures)}, |
| 1831 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME, | 1832 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME, |
| 1832 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS, | 1833 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS, |
| 1833 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, | 1834 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, |
| 1834 #endif | 1835 #endif |
| 1835 // NOTE: Adding new command-line switches requires adding corresponding | 1836 // NOTE: Adding new command-line switches requires adding corresponding |
| 1836 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1837 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 1837 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1838 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 1838 }; | 1839 }; |
| 1839 | 1840 |
| 1840 class FlagsStateSingleton { | 1841 class FlagsStateSingleton { |
| 1841 public: | 1842 public: |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2034 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2035 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2035 | 2036 |
| 2036 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2037 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2037 *count = arraysize(kFeatureEntries); | 2038 *count = arraysize(kFeatureEntries); |
| 2038 return kFeatureEntries; | 2039 return kFeatureEntries; |
| 2039 } | 2040 } |
| 2040 | 2041 |
| 2041 } // namespace testing | 2042 } // namespace testing |
| 2042 | 2043 |
| 2043 } // namespace about_flags | 2044 } // namespace about_flags |
| OLD | NEW |