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

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

Issue 23326003: Enable PNaCl by default (revert disabling CL) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for Jan's comments. Created 7 years, 4 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/chrome_content_browser_client.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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) 507 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
508 }, 508 },
509 { 509 {
510 "nacl-debug-mask", // FLAGS:RECORD_UMA 510 "nacl-debug-mask", // FLAGS:RECORD_UMA
511 IDS_FLAGS_NACL_DEBUG_MASK_NAME, 511 IDS_FLAGS_NACL_DEBUG_MASK_NAME,
512 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, 512 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION,
513 kOsDesktop, 513 kOsDesktop,
514 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) 514 MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
515 }, 515 },
516 { 516 {
517 "enable-pnacl", // FLAGS:RECORD_UMA 517 "disable-pnacl", // FLAGS:RECORD_UMA
518 IDS_FLAGS_ENABLE_PNACL_NAME, 518 IDS_FLAGS_PNACL_NAME,
519 IDS_FLAGS_ENABLE_PNACL_DESCRIPTION, 519 IDS_FLAGS_PNACL_DESCRIPTION,
520 kOsDesktop, 520 kOsDesktop,
521 SINGLE_VALUE_TYPE(switches::kEnablePnacl) 521 ENABLE_DISABLE_VALUE_TYPE("", switches::kDisablePnacl)
522 }, 522 },
523 { 523 {
524 "extension-apis", // FLAGS:RECORD_UMA 524 "extension-apis", // FLAGS:RECORD_UMA
525 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 525 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
526 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 526 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
527 kOsDesktop, 527 kOsDesktop,
528 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis) 528 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)
529 }, 529 },
530 { 530 {
531 "extensions-on-chrome-urls", 531 "extensions-on-chrome-urls",
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 } 2121 }
2122 2122
2123 const Experiment* GetExperiments(size_t* count) { 2123 const Experiment* GetExperiments(size_t* count) {
2124 *count = num_experiments; 2124 *count = num_experiments;
2125 return experiments; 2125 return experiments;
2126 } 2126 }
2127 2127
2128 } // namespace testing 2128 } // namespace testing
2129 2129
2130 } // namespace about_flags 2130 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698