| 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 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1321 IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_NAME, | 1321 IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_NAME, |
| 1322 IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, kOsDesktop, | 1322 IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, kOsDesktop, |
| 1323 MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, | 1323 MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, |
| 1324 #if defined(ENABLE_EXTENSIONS) | 1324 #if defined(ENABLE_EXTENSIONS) |
| 1325 {"extension-active-script-permission", | 1325 {"extension-active-script-permission", |
| 1326 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, | 1326 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, |
| 1327 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, kOsAll, | 1327 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, kOsAll, |
| 1328 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, | 1328 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, |
| 1329 #endif | 1329 #endif |
| 1330 #if defined(OS_ANDROID) | 1330 #if defined(OS_ANDROID) |
| 1331 {"enable-data-reduction-proxy-dev", IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_NAME, | |
| 1332 IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, kOsAndroid, | |
| 1333 ENABLE_DISABLE_VALUE_TYPE( | |
| 1334 data_reduction_proxy::switches::kEnableDataReductionProxyDev, | |
| 1335 data_reduction_proxy::switches::kDisableDataReductionProxyDev)}, | |
| 1336 {"enable-data-reduction-proxy-carrier-test", | 1331 {"enable-data-reduction-proxy-carrier-test", |
| 1337 IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME, | 1332 IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME, |
| 1338 IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION, kOsAndroid, | 1333 IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION, kOsAndroid, |
| 1339 SINGLE_VALUE_TYPE( | 1334 SINGLE_VALUE_TYPE( |
| 1340 data_reduction_proxy::switches::kEnableDataReductionProxyCarrierTest)}, | 1335 data_reduction_proxy::switches::kEnableDataReductionProxyCarrierTest)}, |
| 1341 #endif | 1336 #endif |
| 1342 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, | 1337 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, |
| 1343 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS, | 1338 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS, |
| 1344 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, | 1339 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, |
| 1345 #if defined(ENABLE_EXTENSIONS) | 1340 #if defined(ENABLE_EXTENSIONS) |
| (...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2030 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2025 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2031 | 2026 |
| 2032 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2027 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2033 *count = arraysize(kFeatureEntries); | 2028 *count = arraysize(kFeatureEntries); |
| 2034 return kFeatureEntries; | 2029 return kFeatureEntries; |
| 2035 } | 2030 } |
| 2036 | 2031 |
| 2037 } // namespace testing | 2032 } // namespace testing |
| 2038 | 2033 |
| 2039 } // namespace about_flags | 2034 } // namespace about_flags |
| OLD | NEW |