| 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 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2142 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures) | 2142 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures) |
| 2143 }, | 2143 }, |
| 2144 #endif | 2144 #endif |
| 2145 { | 2145 { |
| 2146 "enable-delay-agnostic-aec", | 2146 "enable-delay-agnostic-aec", |
| 2147 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, | 2147 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, |
| 2148 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, | 2148 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, |
| 2149 kOsDesktop, | 2149 kOsDesktop, |
| 2150 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) | 2150 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) |
| 2151 }, | 2151 }, |
| 2152 { |
| 2153 "enable-data-reduction-proxy-lo-fi", |
| 2154 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_NAME, |
| 2155 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, |
| 2156 kOsAll, |
| 2157 SINGLE_VALUE_TYPE(data_reduction_proxy::switches:: |
| 2158 kEnableDataReductionProxyLoFi) |
| 2159 }, |
| 2160 |
| 2152 | 2161 |
| 2153 { | 2162 { |
| 2154 "mark-non-secure-as", // FLAGS:RECORD_UMA | 2163 "mark-non-secure-as", // FLAGS:RECORD_UMA |
| 2155 IDS_MARK_NON_SECURE_AS_NAME, | 2164 IDS_MARK_NON_SECURE_AS_NAME, |
| 2156 IDS_MARK_NON_SECURE_AS_DESCRIPTION, | 2165 IDS_MARK_NON_SECURE_AS_DESCRIPTION, |
| 2157 kOsAll, | 2166 kOsAll, |
| 2158 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) | 2167 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) |
| 2159 }, | 2168 }, |
| 2160 | 2169 |
| 2161 // NOTE: Adding new command-line switches requires adding corresponding | 2170 // NOTE: Adding new command-line switches requires adding corresponding |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2274 if (!strcmp("enable-data-reduction-proxy-dev", experiment.internal_name) && | 2283 if (!strcmp("enable-data-reduction-proxy-dev", experiment.internal_name) && |
| 2275 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_BETA && | 2284 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_BETA && |
| 2276 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) { | 2285 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) { |
| 2277 return true; | 2286 return true; |
| 2278 } | 2287 } |
| 2279 // enable-data-reduction-proxy-alt is only available for the Dev channel. | 2288 // enable-data-reduction-proxy-alt is only available for the Dev channel. |
| 2280 if (!strcmp("enable-data-reduction-proxy-alt", experiment.internal_name) && | 2289 if (!strcmp("enable-data-reduction-proxy-alt", experiment.internal_name) && |
| 2281 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) { | 2290 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) { |
| 2282 return true; | 2291 return true; |
| 2283 } | 2292 } |
| 2293 // enable-data-reduction-proxy-lo-fi is only available for the Dev channel. |
| 2294 if (!strcmp("enable-data-reduction-proxy-lo-fi", experiment.internal_name) && |
| 2295 chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV && |
| 2296 chrome::VersionInfo::GetChannel() != |
| 2297 chrome::VersionInfo::CHANNEL_CANARY && |
| 2298 chrome::VersionInfo::GetChannel() != |
| 2299 chrome::VersionInfo::CHANNEL_UNKNOWN) { |
| 2300 return true; |
| 2301 } |
| 2284 #endif | 2302 #endif |
| 2285 | 2303 |
| 2286 return false; | 2304 return false; |
| 2287 } | 2305 } |
| 2288 | 2306 |
| 2289 | 2307 |
| 2290 // Variant of GetSanitizedEnabledFlags that also removes any flags that aren't | 2308 // Variant of GetSanitizedEnabledFlags that also removes any flags that aren't |
| 2291 // enabled on the current platform. | 2309 // enabled on the current platform. |
| 2292 void GetSanitizedEnabledFlagsForCurrentPlatform( | 2310 void GetSanitizedEnabledFlagsForCurrentPlatform( |
| 2293 FlagsStorage* flags_storage, std::set<std::string>* result) { | 2311 FlagsStorage* flags_storage, std::set<std::string>* result) { |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2729 } | 2747 } |
| 2730 | 2748 |
| 2731 const Experiment* GetExperiments(size_t* count) { | 2749 const Experiment* GetExperiments(size_t* count) { |
| 2732 *count = num_experiments; | 2750 *count = num_experiments; |
| 2733 return experiments; | 2751 return experiments; |
| 2734 } | 2752 } |
| 2735 | 2753 |
| 2736 } // namespace testing | 2754 } // namespace testing |
| 2737 | 2755 |
| 2738 } // namespace about_flags | 2756 } // namespace about_flags |
| OLD | NEW |