Chromium Code Reviews| 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 193 {IDS_FLAGS_PASSIVE_EVENT_LISTENER_FORCE_ALL_TRUE, | 193 {IDS_FLAGS_PASSIVE_EVENT_LISTENER_FORCE_ALL_TRUE, |
| 194 switches::kPassiveListenersDefault, "forcealltrue"}, | 194 switches::kPassiveListenersDefault, "forcealltrue"}, |
| 195 }; | 195 }; |
| 196 | 196 |
| 197 const FeatureEntry::Choice kMarkNonSecureAsChoices[] = { | 197 const FeatureEntry::Choice kMarkNonSecureAsChoices[] = { |
| 198 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 198 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 199 {IDS_MARK_NON_SECURE_AS_NEUTRAL, security_state::switches::kMarkNonSecureAs, | 199 {IDS_MARK_NON_SECURE_AS_NEUTRAL, security_state::switches::kMarkNonSecureAs, |
| 200 security_state::switches::kMarkNonSecureAsNeutral}, | 200 security_state::switches::kMarkNonSecureAsNeutral}, |
| 201 {IDS_MARK_NON_SECURE_AS_NON_SECURE, | 201 {IDS_MARK_NON_SECURE_AS_NON_SECURE, |
| 202 security_state::switches::kMarkNonSecureAs, | 202 security_state::switches::kMarkNonSecureAs, |
| 203 security_state::switches::kMarkNonSecureAsNonSecure}}; | 203 security_state::switches::kMarkNonSecureAsNonSecure}, |
| 204 {IDS_MARK_NON_SECURE_AS_NON_SECURE_WITH_PASSWORDS, | |
|
elawrence
2016/09/13 17:56:31
Grammatically, IDS_MARK_NON_SECURE_AS_NON_SECURE_W
felt
2016/09/13 18:39:51
Was just for consistency's sake, no strong prefere
| |
| 205 security_state::switches::kMarkNonSecureAs, | |
| 206 security_state::switches::kMarkNonSecureWhenPasswordOrCc}}; | |
| 204 | 207 |
| 205 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { | 208 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { |
| 206 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 209 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 207 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON, | 210 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON, |
| 208 data_reduction_proxy::switches::kDataReductionProxyLoFi, | 211 data_reduction_proxy::switches::kDataReductionProxyLoFi, |
| 209 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, | 212 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, |
| 210 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, | 213 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, |
| 211 data_reduction_proxy::switches::kDataReductionProxyLoFi, | 214 data_reduction_proxy::switches::kDataReductionProxyLoFi, |
| 212 data_reduction_proxy::switches:: | 215 data_reduction_proxy::switches:: |
| 213 kDataReductionProxyLoFiValueCellularOnly}, | 216 kDataReductionProxyLoFiValueCellularOnly}, |
| (...skipping 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2254 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2257 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2255 | 2258 |
| 2256 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2259 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2257 *count = arraysize(kFeatureEntries); | 2260 *count = arraysize(kFeatureEntries); |
| 2258 return kFeatureEntries; | 2261 return kFeatureEntries; |
| 2259 } | 2262 } |
| 2260 | 2263 |
| 2261 } // namespace testing | 2264 } // namespace testing |
| 2262 | 2265 |
| 2263 } // namespace about_flags | 2266 } // namespace about_flags |
| OLD | NEW |