Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 176813010: Avoid blocking the PNaCl translator processes when chrome NaCl GDB flag is on. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 179 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
180 switches::kOverscrollHistoryNavigation, 180 switches::kOverscrollHistoryNavigation,
181 "0" }, 181 "0" },
182 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, 182 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
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, "", "" },
190 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by 189 // 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 190 // debug stub to a remote machine. Since secure shell uses NaCl, we usually
192 // an option to switch off its debugging. 191 // want to avoid debugging that. The PNaCl translator is also a NaCl module,
193 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, 192 // so by default we want to avoid debugging that.
194 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, 193 // NOTE: As the default value must be the empty string, the mask excluding
194 // the PNaCl translator and secure shell is substituted elsewhere.
195 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" },
196 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" },
195 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, 197 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG,
196 switches::kNaClDebugMask, "*://*/*debug.nmf" } 198 switches::kNaClDebugMask, "*://*/*debug.nmf" }
197 }; 199 };
198 200
199 const Experiment::Choice kImplSidePaintingChoices[] = { 201 const Experiment::Choice kImplSidePaintingChoices[] = {
200 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 202 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
201 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 203 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
202 cc::switches::kEnableImplSidePainting, ""}, 204 cc::switches::kEnableImplSidePainting, ""},
203 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 205 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
204 cc::switches::kDisableImplSidePainting, ""} 206 cc::switches::kDisableImplSidePainting, ""}
(...skipping 2215 matching lines...) Expand 10 before | Expand all | Expand 10 after
2420 } 2422 }
2421 2423
2422 const Experiment* GetExperiments(size_t* count) { 2424 const Experiment* GetExperiments(size_t* count) {
2423 *count = num_experiments; 2425 *count = num_experiments;
2424 return experiments; 2426 return experiments;
2425 } 2427 }
2426 2428
2427 } // namespace testing 2429 } // namespace testing
2428 2430
2429 } // namespace about_flags 2431 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/nacl_host/nacl_browser_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698