| 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 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME, | 901 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME, |
| 902 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid, | 902 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid, |
| 903 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, | 903 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, |
| 904 #endif | 904 #endif |
| 905 #if defined(ENABLE_PLUGINS) | 905 #if defined(ENABLE_PLUGINS) |
| 906 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, | 906 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| 907 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, | 907 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, |
| 908 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, | 908 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, |
| 909 #endif | 909 #endif |
| 910 #if defined(OS_CHROMEOS) | 910 #if defined(OS_CHROMEOS) |
| 911 {"mash", | 911 {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS, |
| 912 IDS_FLAGS_USE_MASH_NAME, | |
| 913 IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS, | |
| 914 SINGLE_VALUE_TYPE("mash")}, | 912 SINGLE_VALUE_TYPE("mash")}, |
| 915 {"allow-touchpad-three-finger-click", | 913 {"allow-touchpad-three-finger-click", |
| 916 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, | 914 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| 917 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, | 915 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, |
| 918 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, | 916 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, |
| 919 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, | 917 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, |
| 920 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, | 918 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, |
| 921 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)}, | 919 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)}, |
| 922 {"enable-easy-unlock-proximity-detection", | 920 {"enable-easy-unlock-proximity-detection", |
| 923 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, | 921 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| (...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2096 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, | 2094 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, |
| 2097 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, | 2095 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, |
| 2098 SINGLE_VALUE_TYPE_AND_VALUE( | 2096 SINGLE_VALUE_TYPE_AND_VALUE( |
| 2099 chromeos::switches::kArcUseAuthEndpoint, | 2097 chromeos::switches::kArcUseAuthEndpoint, |
| 2100 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" | 2098 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" |
| 2101 "ExchangeToken")}, | 2099 "ExchangeToken")}, |
| 2102 #endif | 2100 #endif |
| 2103 {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME, | 2101 {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME, |
| 2104 IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop, | 2102 IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop, |
| 2105 MULTI_VALUE_TYPE(kSecurityVerboseChoices)}, | 2103 MULTI_VALUE_TYPE(kSecurityVerboseChoices)}, |
| 2104 {"expensive-background-timer-throttling", |
| 2105 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_NAME, |
| 2106 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_DESCRIPTION, kOsAll, |
| 2107 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)}, |
| 2106 // NOTE: Adding new command-line switches requires adding corresponding | 2108 // NOTE: Adding new command-line switches requires adding corresponding |
| 2107 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2109 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2108 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2110 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2109 }; | 2111 }; |
| 2110 | 2112 |
| 2111 class FlagsStateSingleton { | 2113 class FlagsStateSingleton { |
| 2112 public: | 2114 public: |
| 2113 FlagsStateSingleton() | 2115 FlagsStateSingleton() |
| 2114 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2116 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
| 2115 ~FlagsStateSingleton() {} | 2117 ~FlagsStateSingleton() {} |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2304 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2306 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2305 | 2307 |
| 2306 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2308 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2307 *count = arraysize(kFeatureEntries); | 2309 *count = arraysize(kFeatureEntries); |
| 2308 return kFeatureEntries; | 2310 return kFeatureEntries; |
| 2309 } | 2311 } |
| 2310 | 2312 |
| 2311 } // namespace testing | 2313 } // namespace testing |
| 2312 | 2314 |
| 2313 } // namespace about_flags | 2315 } // namespace about_flags |
| OLD | NEW |