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 kMarkHttpAsNonSecureChoices[] = { | |
192 { IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_NO, | |
193 switches::kMarkHttpAsNonSecure, "no"}, | |
194 { IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_NON_SECURE, | |
195 switches::kMarkHttpAsNonSecure, "non-secure"}, | |
196 { IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_DUBIOUS, | |
197 switches::kMarkHttpAsNonSecure, "dubious"} | |
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 1880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2081 }, | 2090 }, |
2082 { | 2091 { |
2083 "enable-fill-on-account-select", | 2092 "enable-fill-on-account-select", |
2084 IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 2093 IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
2085 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, | 2094 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, |
2086 kOsAll, | 2095 kOsAll, |
2087 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableFillOnAccountSelect, | 2096 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableFillOnAccountSelect, |
2088 autofill::switches::kDisableFillOnAccountSelect) | 2097 autofill::switches::kDisableFillOnAccountSelect) |
2089 }, | 2098 }, |
2090 | 2099 |
2100 { | |
2101 "mark-http-as-non-secure", // FLAGS:RECORD_UMA | |
jww
2014/12/20 02:07:58
Somewhere at the top of this array, there are inst
palmer
2014/12/20 02:32:33
Done.
| |
2102 IDS_MARK_HTTP_AS_NON_SECURE_NAME, | |
2103 IDS_MARK_HTTP_AS_NON_SECURE_DESCRIPTION, | |
2104 kOsAll, | |
2105 MULTI_VALUE_TYPE(kMarkHttpAsNonSecureChoices) | |
2106 }, | |
2107 | |
2091 // NOTE: Adding new command-line switches requires adding corresponding | 2108 // NOTE: Adding new command-line switches requires adding corresponding |
2092 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2109 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2093 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2110 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2094 }; | 2111 }; |
2095 | 2112 |
2096 const Experiment* experiments = kExperiments; | 2113 const Experiment* experiments = kExperiments; |
2097 size_t num_experiments = arraysize(kExperiments); | 2114 size_t num_experiments = arraysize(kExperiments); |
2098 | 2115 |
2099 // Stores and encapsulates the little state that about:flags has. | 2116 // Stores and encapsulates the little state that about:flags has. |
2100 class FlagsState { | 2117 class FlagsState { |
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2659 } | 2676 } |
2660 | 2677 |
2661 const Experiment* GetExperiments(size_t* count) { | 2678 const Experiment* GetExperiments(size_t* count) { |
2662 *count = num_experiments; | 2679 *count = num_experiments; |
2663 return experiments; | 2680 return experiments; |
2664 } | 2681 } |
2665 | 2682 |
2666 } // namespace testing | 2683 } // namespace testing |
2667 | 2684 |
2668 } // namespace about_flags | 2685 } // namespace about_flags |
OLD | NEW |