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

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

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review changes 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 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) 506 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
507 }, 507 },
508 { 508 {
509 "nacl-debug-mask", // FLAGS:RECORD_UMA 509 "nacl-debug-mask", // FLAGS:RECORD_UMA
510 IDS_FLAGS_NACL_DEBUG_MASK_NAME, 510 IDS_FLAGS_NACL_DEBUG_MASK_NAME,
511 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, 511 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION,
512 kOsDesktop, 512 kOsDesktop,
513 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) 513 MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
514 }, 514 },
515 { 515 {
516 "disable-pnacl", // FLAGS:RECORD_UMA 516 "enable-pnacl", // FLAGS:RECORD_UMA
517 IDS_FLAGS_PNACL_NAME, 517 IDS_FLAGS_ENABLE_PNACL_NAME,
518 IDS_FLAGS_PNACL_DESCRIPTION, 518 IDS_FLAGS_ENABLE_PNACL_DESCRIPTION,
519 kOsDesktop, 519 kOsDesktop,
520 ENABLE_DISABLE_VALUE_TYPE("", switches::kDisablePnacl) 520 SINGLE_VALUE_TYPE(switches::kEnablePnacl)
521 }, 521 },
522 { 522 {
523 "extension-apis", // FLAGS:RECORD_UMA 523 "extension-apis", // FLAGS:RECORD_UMA
524 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 524 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
525 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 525 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
526 kOsDesktop, 526 kOsDesktop,
527 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis) 527 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)
528 }, 528 },
529 { 529 {
530 "extensions-on-chrome-urls", 530 "extensions-on-chrome-urls",
(...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after
2091 } 2091 }
2092 2092
2093 const Experiment* GetExperiments(size_t* count) { 2093 const Experiment* GetExperiments(size_t* count) {
2094 *count = num_experiments; 2094 *count = num_experiments;
2095 return experiments; 2095 return experiments;
2096 } 2096 }
2097 2097
2098 } // namespace testing 2098 } // namespace testing
2099 2099
2100 } // namespace about_flags 2100 } // 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