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

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

Issue 23727002: Add --disable-pnacl to about://flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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') | no next file » | 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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 SINGLE_VALUE_TYPE(switches::kEnableNaCl) 508 SINGLE_VALUE_TYPE(switches::kEnableNaCl)
509 }, 509 },
510 { 510 {
511 "enable-nacl-debug", // FLAGS:RECORD_UMA 511 "enable-nacl-debug", // FLAGS:RECORD_UMA
512 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, 512 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME,
513 IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION, 513 IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION,
514 kOsDesktop, 514 kOsDesktop,
515 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) 515 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
516 }, 516 },
517 { 517 {
518 "disable-pnacl", // FLAGS:RECORD_UMA
519 IDS_FLAGS_DISABLE_PNACL_NAME,
520 IDS_FLAGS_DISABLE_PNACL_DESCRIPTION,
521 kOsDesktop,
522 SINGLE_VALUE_TYPE(switches::kDisablePnacl)
523 },
524 {
518 "nacl-debug-mask", // FLAGS:RECORD_UMA 525 "nacl-debug-mask", // FLAGS:RECORD_UMA
519 IDS_FLAGS_NACL_DEBUG_MASK_NAME, 526 IDS_FLAGS_NACL_DEBUG_MASK_NAME,
520 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, 527 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION,
521 kOsDesktop, 528 kOsDesktop,
522 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) 529 MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
523 }, 530 },
524 { 531 {
525 "extension-apis", // FLAGS:RECORD_UMA 532 "extension-apis", // FLAGS:RECORD_UMA
526 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 533 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
527 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 534 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 } 2128 }
2122 2129
2123 const Experiment* GetExperiments(size_t* count) { 2130 const Experiment* GetExperiments(size_t* count) {
2124 *count = num_experiments; 2131 *count = num_experiments;
2125 return experiments; 2132 return experiments;
2126 } 2133 }
2127 2134
2128 } // namespace testing 2135 } // namespace testing
2129 2136
2130 } // namespace about_flags 2137 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698