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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 // so by default we want to avoid debugging that. | 181 // so by default we want to avoid debugging that. |
182 // NOTE: As the default value must be the empty string, the mask excluding | 182 // NOTE: As the default value must be the empty string, the mask excluding |
183 // the PNaCl translator and secure shell is substituted elsewhere. | 183 // the PNaCl translator and secure shell is substituted elsewhere. |
184 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, | 184 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, |
185 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, | 185 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, |
186 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, | 186 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, |
187 switches::kNaClDebugMask, "*://*/*debug.nmf" } | 187 switches::kNaClDebugMask, "*://*/*debug.nmf" } |
188 }; | 188 }; |
189 #endif | 189 #endif |
190 | 190 |
| 191 const Experiment::Choice kMarkNonSecureAsChoices[] = { |
| 192 { IDS_MARK_NON_SECURE_AS_NEUTRAL, |
| 193 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNeutral}, |
| 194 { IDS_MARK_NON_SECURE_AS_NON_SECURE, |
| 195 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNonSecure}, |
| 196 { IDS_MARK_NON_SECURE_AS_DUBIOUS, |
| 197 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsDubious} |
| 198 }; |
| 199 |
191 const Experiment::Choice kMaxTilesForInterestAreaChoices[] = { | 200 const Experiment::Choice kMaxTilesForInterestAreaChoices[] = { |
192 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 201 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
193 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_SHORT, | 202 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_SHORT, |
194 cc::switches::kMaxTilesForInterestArea, "64"}, | 203 cc::switches::kMaxTilesForInterestArea, "64"}, |
195 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_TALL, | 204 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_TALL, |
196 cc::switches::kMaxTilesForInterestArea, "128"}, | 205 cc::switches::kMaxTilesForInterestArea, "128"}, |
197 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_GRANDE, | 206 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_GRANDE, |
198 cc::switches::kMaxTilesForInterestArea, "256"}, | 207 cc::switches::kMaxTilesForInterestArea, "256"}, |
199 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_VENTI, | 208 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_VENTI, |
200 cc::switches::kMaxTilesForInterestArea, "512"} | 209 cc::switches::kMaxTilesForInterestArea, "512"} |
(...skipping 1912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2113 }, | 2122 }, |
2114 #endif | 2123 #endif |
2115 { | 2124 { |
2116 "enable-delay-agnostic-aec", | 2125 "enable-delay-agnostic-aec", |
2117 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, | 2126 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, |
2118 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, | 2127 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, |
2119 kOsDesktop, | 2128 kOsDesktop, |
2120 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) | 2129 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) |
2121 }, | 2130 }, |
2122 | 2131 |
| 2132 { |
| 2133 "mark-http-as-non-secure", // FLAGS:RECORD_UMA |
| 2134 IDS_MARK_NON_SECURE_AS_NAME, |
| 2135 IDS_MARK_NON_SECURE_AS_DESCRIPTION, |
| 2136 kOsAll, |
| 2137 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) |
| 2138 }, |
| 2139 |
2123 // NOTE: Adding new command-line switches requires adding corresponding | 2140 // NOTE: Adding new command-line switches requires adding corresponding |
2124 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2141 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2125 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2142 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2126 }; | 2143 }; |
2127 | 2144 |
2128 const Experiment* experiments = kExperiments; | 2145 const Experiment* experiments = kExperiments; |
2129 size_t num_experiments = arraysize(kExperiments); | 2146 size_t num_experiments = arraysize(kExperiments); |
2130 | 2147 |
2131 // Stores and encapsulates the little state that about:flags has. | 2148 // Stores and encapsulates the little state that about:flags has. |
2132 class FlagsState { | 2149 class FlagsState { |
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2691 } | 2708 } |
2692 | 2709 |
2693 const Experiment* GetExperiments(size_t* count) { | 2710 const Experiment* GetExperiments(size_t* count) { |
2694 *count = num_experiments; | 2711 *count = num_experiments; |
2695 return experiments; | 2712 return experiments; |
2696 } | 2713 } |
2697 | 2714 |
2698 } // namespace testing | 2715 } // namespace testing |
2699 | 2716 |
2700 } // namespace about_flags | 2717 } // namespace about_flags |
OLD | NEW |