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 1898 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2099 #if defined(OS_CHROMEOS) | 2108 #if defined(OS_CHROMEOS) |
2100 { | 2109 { |
2101 "enable-wifi-credential-sync", // FLAGS:RECORD_UMA | 2110 "enable-wifi-credential-sync", // FLAGS:RECORD_UMA |
2102 IDS_FLAGS_ENABLE_WIFI_CREDENTIAL_SYNC_NAME, | 2111 IDS_FLAGS_ENABLE_WIFI_CREDENTIAL_SYNC_NAME, |
2103 IDS_FLAGS_ENABLE_WIFI_CREDENTIAL_SYNC_DESCRIPTION, | 2112 IDS_FLAGS_ENABLE_WIFI_CREDENTIAL_SYNC_DESCRIPTION, |
2104 kOsCrOS, | 2113 kOsCrOS, |
2105 SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync) | 2114 SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync) |
2106 }, | 2115 }, |
2107 #endif | 2116 #endif |
2108 | 2117 |
| 2118 { |
| 2119 "mark-http-as-non-secure", // FLAGS:RECORD_UMA |
| 2120 IDS_MARK_HTTP_AS_NON_SECURE_NAME, |
| 2121 IDS_MARK_HTTP_AS_NON_SECURE_DESCRIPTION, |
| 2122 kOsAll, |
| 2123 MULTI_VALUE_TYPE(kMarkHttpAsNonSecureChoices) |
| 2124 }, |
| 2125 |
2109 // NOTE: Adding new command-line switches requires adding corresponding | 2126 // NOTE: Adding new command-line switches requires adding corresponding |
2110 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2127 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2111 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2128 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2112 }; | 2129 }; |
2113 | 2130 |
2114 const Experiment* experiments = kExperiments; | 2131 const Experiment* experiments = kExperiments; |
2115 size_t num_experiments = arraysize(kExperiments); | 2132 size_t num_experiments = arraysize(kExperiments); |
2116 | 2133 |
2117 // Stores and encapsulates the little state that about:flags has. | 2134 // Stores and encapsulates the little state that about:flags has. |
2118 class FlagsState { | 2135 class FlagsState { |
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2677 } | 2694 } |
2678 | 2695 |
2679 const Experiment* GetExperiments(size_t* count) { | 2696 const Experiment* GetExperiments(size_t* count) { |
2680 *count = num_experiments; | 2697 *count = num_experiments; |
2681 return experiments; | 2698 return experiments; |
2682 } | 2699 } |
2683 | 2700 |
2684 } // namespace testing | 2701 } // namespace testing |
2685 | 2702 |
2686 } // namespace about_flags | 2703 } // namespace about_flags |
OLD | NEW |