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

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

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) 543 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
544 }, 544 },
545 { 545 {
546 "nacl-debug-mask", // FLAGS:RECORD_UMA 546 "nacl-debug-mask", // FLAGS:RECORD_UMA
547 IDS_FLAGS_NACL_DEBUG_MASK_NAME, 547 IDS_FLAGS_NACL_DEBUG_MASK_NAME,
548 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, 548 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION,
549 kOsDesktop, 549 kOsDesktop,
550 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) 550 MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
551 }, 551 },
552 { 552 {
553 "enable-pnacl", // FLAGS:RECORD_UMA 553 "disable-pnacl", // FLAGS:RECORD_UMA
554 IDS_FLAGS_ENABLE_PNACL_NAME, 554 IDS_FLAGS_DISABLE_PNACL_NAME,
555 IDS_FLAGS_ENABLE_PNACL_DESCRIPTION, 555 IDS_FLAGS_DISABLE_PNACL_DESCRIPTION,
556 kOsDesktop, 556 kOsDesktop,
557 SINGLE_VALUE_TYPE(switches::kEnablePnacl) 557 SINGLE_VALUE_TYPE(switches::kDisablePnacl)
558 }, 558 },
559 { 559 {
560 "extension-apis", // FLAGS:RECORD_UMA 560 "extension-apis", // FLAGS:RECORD_UMA
561 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 561 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
562 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 562 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
563 kOsDesktop, 563 kOsDesktop,
564 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) 564 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis)
565 }, 565 },
566 { 566 {
567 "extensions-on-chrome-urls", 567 "extensions-on-chrome-urls",
(...skipping 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after
2113 } 2113 }
2114 2114
2115 const Experiment* GetExperiments(size_t* count) { 2115 const Experiment* GetExperiments(size_t* count) {
2116 *count = num_experiments; 2116 *count = num_experiments;
2117 return experiments; 2117 return experiments;
2118 } 2118 }
2119 2119
2120 } // namespace testing 2120 } // namespace testing
2121 2121
2122 } // namespace about_flags 2122 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698