| 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 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1647 IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, | 1647 IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, |
| 1648 kOsDesktop, | 1648 kOsDesktop, |
| 1649 MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, | 1649 MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, |
| 1650 #if defined(ENABLE_EXTENSIONS) | 1650 #if defined(ENABLE_EXTENSIONS) |
| 1651 {"extension-active-script-permission", | 1651 {"extension-active-script-permission", |
| 1652 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, | 1652 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, |
| 1653 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, | 1653 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, |
| 1654 kOsAll, | 1654 kOsAll, |
| 1655 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, | 1655 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, |
| 1656 #endif | 1656 #endif |
| 1657 {"answers-in-suggest", | |
| 1658 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, | |
| 1659 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, | |
| 1660 kOsAndroid | kOsDesktop, | |
| 1661 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAnswersInSuggest, | |
| 1662 switches::kDisableAnswersInSuggest)}, | |
| 1663 #if defined(OS_ANDROID) | 1657 #if defined(OS_ANDROID) |
| 1664 {"enable-data-reduction-proxy-dev", | 1658 {"enable-data-reduction-proxy-dev", |
| 1665 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME, | 1659 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME, |
| 1666 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, | 1660 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, |
| 1667 kOsAndroid, | 1661 kOsAndroid, |
| 1668 ENABLE_DISABLE_VALUE_TYPE( | 1662 ENABLE_DISABLE_VALUE_TYPE( |
| 1669 data_reduction_proxy::switches::kEnableDataReductionProxyDev, | 1663 data_reduction_proxy::switches::kEnableDataReductionProxyDev, |
| 1670 data_reduction_proxy::switches::kDisableDataReductionProxyDev)}, | 1664 data_reduction_proxy::switches::kDisableDataReductionProxyDev)}, |
| 1671 {"enable-data-reduction-proxy-carrier-test", | 1665 {"enable-data-reduction-proxy-carrier-test", |
| 1672 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME, | 1666 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME, |
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2662 } | 2656 } |
| 2663 | 2657 |
| 2664 const Experiment* GetExperiments(size_t* count) { | 2658 const Experiment* GetExperiments(size_t* count) { |
| 2665 *count = num_experiments; | 2659 *count = num_experiments; |
| 2666 return experiments; | 2660 return experiments; |
| 2667 } | 2661 } |
| 2668 | 2662 |
| 2669 } // namespace testing | 2663 } // namespace testing |
| 2670 | 2664 |
| 2671 } // namespace about_flags | 2665 } // namespace about_flags |
| OLD | NEW |