Chromium Code Reviews| Index: chrome/browser/about_flags.cc |
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
| index f11a2c4e7db93665bbb9207f5aaa53e620109901..ed88089dfc996c8c76d7259ab6098383544e5db7 100644 |
| --- a/chrome/browser/about_flags.cc |
| +++ b/chrome/browser/about_flags.cc |
| @@ -186,12 +186,13 @@ const Experiment::Choice kOverscrollHistoryNavigationChoices[] = { |
| #endif |
| const Experiment::Choice kNaClDebugMaskChoices[] = { |
| - { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| // Secure shell can be used on ChromeOS for forwarding the TCP port opened by |
| - // debug stub to a remote machine. Since secure shell uses NaCl, we provide |
| - // an option to switch off its debugging. |
| - { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, |
| - switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, |
| + // debug stub to a remote machine. Since secure shell uses NaCl, we usually |
| + // want to avoid debugging that. The PNaCl translator is also a NaCl module, |
| + // so by default we want to avoid debugging that (the empty string will |
| + // be overridden to the expected default). |
| + { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, |
|
bradn
2014/03/06 18:56:34
Maybe pull out the stuff in parens to:
NOTE: As th
jvoung (off chromium)
2014/03/06 19:02:51
Done.
|
| + { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, |
| { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, |
| switches::kNaClDebugMask, "*://*/*debug.nmf" } |
| }; |