| 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 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1776 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, | 1776 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
| 1777 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, | 1777 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
| 1778 kOsCrOS, | 1778 kOsCrOS, |
| 1779 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption)}, | 1779 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption)}, |
| 1780 #endif // defined(OS_CHROMEOS) | 1780 #endif // defined(OS_CHROMEOS) |
| 1781 {"data-reduction-proxy-lo-fi", | 1781 {"data-reduction-proxy-lo-fi", |
| 1782 IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME, | 1782 IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME, |
| 1783 IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, | 1783 IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, |
| 1784 kOsAll, | 1784 kOsAll, |
| 1785 MULTI_VALUE_TYPE(kDataReductionProxyLoFiChoices)}, | 1785 MULTI_VALUE_TYPE(kDataReductionProxyLoFiChoices)}, |
| 1786 {"enable-data-reduction-proxy-lo-fi-preview", |
| 1787 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_NAME, |
| 1788 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_DESCRIPTION, |
| 1789 kOsAll, |
| 1790 SINGLE_VALUE_TYPE( |
| 1791 data_reduction_proxy::switches::kEnableDataReductionProxyLoFiPreview)}, |
| 1786 {"clear-data-reduction-proxy-data-savings", | 1792 {"clear-data-reduction-proxy-data-savings", |
| 1787 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_NAME, | 1793 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_NAME, |
| 1788 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, | 1794 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, |
| 1789 kOsAll, | 1795 kOsAll, |
| 1790 SINGLE_VALUE_TYPE( | 1796 SINGLE_VALUE_TYPE( |
| 1791 data_reduction_proxy::switches::kClearDataReductionProxyDataSavings)}, | 1797 data_reduction_proxy::switches::kClearDataReductionProxyDataSavings)}, |
| 1792 {"enable-data-reduction-proxy-config-client", | 1798 {"enable-data-reduction-proxy-config-client", |
| 1793 IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_NAME, | 1799 IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_NAME, |
| 1794 IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_DESCRIPTION, | 1800 IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_DESCRIPTION, |
| 1795 kOsAll, | 1801 kOsAll, |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2314 // builds and the Canary/Dev channel. | 2320 // builds and the Canary/Dev channel. |
| 2315 if (!strcmp("enable-data-reduction-proxy-carrier-test", | 2321 if (!strcmp("enable-data-reduction-proxy-carrier-test", |
| 2316 entry.internal_name) && | 2322 entry.internal_name) && |
| 2317 channel != version_info::Channel::DEV && | 2323 channel != version_info::Channel::DEV && |
| 2318 channel != version_info::Channel::CANARY && | 2324 channel != version_info::Channel::CANARY && |
| 2319 channel != version_info::Channel::UNKNOWN) { | 2325 channel != version_info::Channel::UNKNOWN) { |
| 2320 return true; | 2326 return true; |
| 2321 } | 2327 } |
| 2322 #endif | 2328 #endif |
| 2323 | 2329 |
| 2324 // data-reduction-proxy-lo-fi is only available for Chromium builds and | 2330 // data-reduction-proxy-lo-fi and enable-data-reduction-proxy-lo-fi-preview |
| 2325 // the Canary/Dev/Beta channels. | 2331 // are only available for Chromium builds and the Canary/Dev/Beta channels. |
| 2326 if (!strcmp("data-reduction-proxy-lo-fi", entry.internal_name) && | 2332 if ((!strcmp("data-reduction-proxy-lo-fi", entry.internal_name) || |
| 2333 !strcmp("enable-data-reduction-proxy-lo-fi-preview", |
| 2334 entry.internal_name)) && |
| 2327 channel != version_info::Channel::BETA && | 2335 channel != version_info::Channel::BETA && |
| 2328 channel != version_info::Channel::DEV && | 2336 channel != version_info::Channel::DEV && |
| 2329 channel != version_info::Channel::CANARY && | 2337 channel != version_info::Channel::CANARY && |
| 2330 channel != version_info::Channel::UNKNOWN) { | 2338 channel != version_info::Channel::UNKNOWN) { |
| 2331 return true; | 2339 return true; |
| 2332 } | 2340 } |
| 2333 | 2341 |
| 2334 // enable-data-reduction-proxy-config-client is only available for Chromium | 2342 // enable-data-reduction-proxy-config-client is only available for Chromium |
| 2335 // builds and the Canary/Dev channels. | 2343 // builds and the Canary/Dev channels. |
| 2336 if (!strcmp("enable-data-reduction-proxy-config-client", | 2344 if (!strcmp("enable-data-reduction-proxy-config-client", |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2914 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2922 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
| 2915 } | 2923 } |
| 2916 | 2924 |
| 2917 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2925 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2918 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2926 return FlagsState::GetInstance()->GetFeatureEntries(count); |
| 2919 } | 2927 } |
| 2920 | 2928 |
| 2921 } // namespace testing | 2929 } // namespace testing |
| 2922 | 2930 |
| 2923 } // namespace about_flags | 2931 } // namespace about_flags |
| OLD | NEW |