| 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 }; | 199 }; |
| 200 | 200 |
| 201 const FeatureEntry::Choice kMarkHttpAsChoices[] = { | 201 const FeatureEntry::Choice kMarkHttpAsChoices[] = { |
| 202 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 202 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 203 {IDS_MARK_HTTP_AS_NEUTRAL, security_state::switches::kMarkHttpAs, | 203 {IDS_MARK_HTTP_AS_NEUTRAL, security_state::switches::kMarkHttpAs, |
| 204 security_state::switches::kMarkHttpAsNeutral}, | 204 security_state::switches::kMarkHttpAsNeutral}, |
| 205 {IDS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs, | 205 {IDS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs, |
| 206 security_state::switches::kMarkHttpAsDangerous}, | 206 security_state::switches::kMarkHttpAsDangerous}, |
| 207 {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP, | 207 {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP, |
| 208 security_state::switches::kMarkHttpAs, | 208 security_state::switches::kMarkHttpAs, |
| 209 security_state::switches::kMarkHttpWithPasswordsOrCcWithChip}}; | 209 security_state::switches::kMarkHttpWithPasswordsOrCcWithChip}, |
| 210 {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP_AND_FORM_WARNING, |
| 211 security_state::switches::kMarkHttpAs, |
| 212 security_state::switches:: |
| 213 kMarkHttpWithPasswordsOrCcWithChipAndFormWarning}}; |
| 210 | 214 |
| 211 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { | 215 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { |
| 212 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 216 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 213 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON, | 217 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON, |
| 214 data_reduction_proxy::switches::kDataReductionProxyLoFi, | 218 data_reduction_proxy::switches::kDataReductionProxyLoFi, |
| 215 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, | 219 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, |
| 216 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, | 220 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, |
| 217 data_reduction_proxy::switches::kDataReductionProxyLoFi, | 221 data_reduction_proxy::switches::kDataReductionProxyLoFi, |
| 218 data_reduction_proxy::switches:: | 222 data_reduction_proxy::switches:: |
| 219 kDataReductionProxyLoFiValueCellularOnly}, | 223 kDataReductionProxyLoFiValueCellularOnly}, |
| (...skipping 2077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2297 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2301 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2298 | 2302 |
| 2299 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2303 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2300 *count = arraysize(kFeatureEntries); | 2304 *count = arraysize(kFeatureEntries); |
| 2301 return kFeatureEntries; | 2305 return kFeatureEntries; |
| 2302 } | 2306 } |
| 2303 | 2307 |
| 2304 } // namespace testing | 2308 } // namespace testing |
| 2305 | 2309 |
| 2306 } // namespace about_flags | 2310 } // namespace about_flags |
| OLD | NEW |