| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 switches::kOverscrollHistoryNavigation, | 183 switches::kOverscrollHistoryNavigation, |
| 184 "2" } | 184 "2" } |
| 185 }; | 185 }; |
| 186 #endif | 186 #endif |
| 187 | 187 |
| 188 const Experiment::Choice kNaClDebugMaskChoices[] = { | 188 const Experiment::Choice kNaClDebugMaskChoices[] = { |
| 189 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 189 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 190 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by | 190 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by |
| 191 // debug stub to a remote machine. Since secure shell uses NaCl, we provide | 191 // debug stub to a remote machine. Since secure shell uses NaCl, we provide |
| 192 // an option to switch off its debugging. | 192 // an option to switch off its debugging. |
| 193 // The PNaCl translator is a NaCl module that runs before the user's |
| 194 // actual NaCl module, so we want to be able to switch off debugging that. |
| 195 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, |
| 196 switches::kNaClDebugMask, |
| 197 "!*://*/*ssh_client.nmf,chrome://pnacl-translator/*" }, |
| 193 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, | 198 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, |
| 194 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, | 199 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, |
| 195 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, | 200 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, |
| 196 switches::kNaClDebugMask, "*://*/*debug.nmf" } | 201 switches::kNaClDebugMask, "*://*/*debug.nmf" } |
| 197 }; | 202 }; |
| 198 | 203 |
| 199 const Experiment::Choice kImplSidePaintingChoices[] = { | 204 const Experiment::Choice kImplSidePaintingChoices[] = { |
| 200 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 205 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 201 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 206 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 202 cc::switches::kEnableImplSidePainting, ""}, | 207 cc::switches::kEnableImplSidePainting, ""}, |
| (...skipping 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2447 } | 2452 } |
| 2448 | 2453 |
| 2449 const Experiment* GetExperiments(size_t* count) { | 2454 const Experiment* GetExperiments(size_t* count) { |
| 2450 *count = num_experiments; | 2455 *count = num_experiments; |
| 2451 return experiments; | 2456 return experiments; |
| 2452 } | 2457 } |
| 2453 | 2458 |
| 2454 } // namespace testing | 2459 } // namespace testing |
| 2455 | 2460 |
| 2456 } // namespace about_flags | 2461 } // namespace about_flags |
| OLD | NEW |