| 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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 }; | 198 }; |
| 199 | 199 |
| 200 const FeatureEntry::Choice kMarkHttpAsChoices[] = { | 200 const FeatureEntry::Choice kMarkHttpAsChoices[] = { |
| 201 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 201 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 202 {IDS_MARK_HTTP_AS_NEUTRAL, security_state::switches::kMarkHttpAs, | 202 {IDS_MARK_HTTP_AS_NEUTRAL, security_state::switches::kMarkHttpAs, |
| 203 security_state::switches::kMarkHttpAsNeutral}, | 203 security_state::switches::kMarkHttpAsNeutral}, |
| 204 {IDS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs, | 204 {IDS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs, |
| 205 security_state::switches::kMarkHttpAsDangerous}, | 205 security_state::switches::kMarkHttpAsDangerous}, |
| 206 {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP, | 206 {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP, |
| 207 security_state::switches::kMarkHttpAs, | 207 security_state::switches::kMarkHttpAs, |
| 208 security_state::switches::kMarkHttpWithPasswordsOrCcWithChip}}; | 208 security_state::switches::kMarkHttpWithPasswordsOrCcWithChip}, |
| 209 {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP_AND_FORM_WARNING, |
| 210 security_state::switches::kMarkHttpAs, |
| 211 security_state::switches:: |
| 212 kMarkHttpWithPasswordsOrCcWithChipAndFormWarning}}; |
| 209 | 213 |
| 210 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { | 214 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { |
| 211 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 215 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 212 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON, | 216 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON, |
| 213 data_reduction_proxy::switches::kDataReductionProxyLoFi, | 217 data_reduction_proxy::switches::kDataReductionProxyLoFi, |
| 214 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, | 218 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, |
| 215 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, | 219 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, |
| 216 data_reduction_proxy::switches::kDataReductionProxyLoFi, | 220 data_reduction_proxy::switches::kDataReductionProxyLoFi, |
| 217 data_reduction_proxy::switches:: | 221 data_reduction_proxy::switches:: |
| 218 kDataReductionProxyLoFiValueCellularOnly}, | 222 kDataReductionProxyLoFiValueCellularOnly}, |
| (...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2278 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2282 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2279 | 2283 |
| 2280 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2284 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2281 *count = arraysize(kFeatureEntries); | 2285 *count = arraysize(kFeatureEntries); |
| 2282 return kFeatureEntries; | 2286 return kFeatureEntries; |
| 2283 } | 2287 } |
| 2284 | 2288 |
| 2285 } // namespace testing | 2289 } // namespace testing |
| 2286 | 2290 |
| 2287 } // namespace about_flags | 2291 } // namespace about_flags |
| OLD | NEW |