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

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

Issue 14122010: NaCl: Enable untrusted hardware exception handling by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove env var Created 7 years, 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <iterator> 10 #include <iterator>
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 MULTI_VALUE_TYPE(kEnableCompositingForFixedPositionChoices) 446 MULTI_VALUE_TYPE(kEnableCompositingForFixedPositionChoices)
447 }, 447 },
448 // TODO(bbudge): When NaCl is on by default, remove this flag entry. 448 // TODO(bbudge): When NaCl is on by default, remove this flag entry.
449 { 449 {
450 "enable-nacl", // FLAGS:RECORD_UMA 450 "enable-nacl", // FLAGS:RECORD_UMA
451 IDS_FLAGS_ENABLE_NACL_NAME, 451 IDS_FLAGS_ENABLE_NACL_NAME,
452 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, 452 IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
453 kOsDesktop, 453 kOsDesktop,
454 SINGLE_VALUE_TYPE(switches::kEnableNaCl) 454 SINGLE_VALUE_TYPE(switches::kEnableNaCl)
455 }, 455 },
456 // TODO(halyavin): When exception handling is on by default, replace this
457 // flag with disable-nacl-exception-handling.
458 {
459 "enable-nacl-exception-handling", // FLAGS:RECORD_UMA
460 IDS_FLAGS_ENABLE_NACL_EXCEPTION_HANDLING_NAME,
461 IDS_FLAGS_ENABLE_NACL_EXCEPTION_HANDLING_DESCRIPTION,
462 kOsDesktop,
463 SINGLE_VALUE_TYPE(switches::kEnableNaClExceptionHandling)
464 },
465 { 456 {
466 "enable-nacl-debug", // FLAGS:RECORD_UMA 457 "enable-nacl-debug", // FLAGS:RECORD_UMA
467 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, 458 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME,
468 IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION, 459 IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION,
469 kOsDesktop, 460 kOsDesktop,
470 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) 461 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
471 }, 462 },
472 { 463 {
473 "nacl-debug-mask", // FLAGS:RECORD_UMA 464 "nacl-debug-mask", // FLAGS:RECORD_UMA
474 IDS_FLAGS_NACL_DEBUG_MASK_NAME, 465 IDS_FLAGS_NACL_DEBUG_MASK_NAME,
(...skipping 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after
1844 } 1835 }
1845 1836
1846 const Experiment* GetExperiments(size_t* count) { 1837 const Experiment* GetExperiments(size_t* count) {
1847 *count = num_experiments; 1838 *count = num_experiments;
1848 return experiments; 1839 return experiments;
1849 } 1840 }
1850 1841
1851 } // namespace testing 1842 } // namespace testing
1852 1843
1853 } // namespace about_flags 1844 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698