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

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

Issue 392023002: Remove disable-pnacl flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 SINGLE_VALUE_TYPE(switches::kEnableNaCl) 673 SINGLE_VALUE_TYPE(switches::kEnableNaCl)
674 }, 674 },
675 { 675 {
676 "enable-nacl-debug", // FLAGS:RECORD_UMA 676 "enable-nacl-debug", // FLAGS:RECORD_UMA
677 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, 677 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME,
678 IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION, 678 IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION,
679 kOsDesktop, 679 kOsDesktop,
680 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) 680 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
681 }, 681 },
682 { 682 {
683 "disable-pnacl", // FLAGS:RECORD_UMA
684 IDS_FLAGS_DISABLE_PNACL_NAME,
685 IDS_FLAGS_DISABLE_PNACL_DESCRIPTION,
686 kOsDesktop,
687 SINGLE_VALUE_TYPE(switches::kDisablePnacl)
688 },
689 {
690 "nacl-debug-mask", // FLAGS:RECORD_UMA 683 "nacl-debug-mask", // FLAGS:RECORD_UMA
691 IDS_FLAGS_NACL_DEBUG_MASK_NAME, 684 IDS_FLAGS_NACL_DEBUG_MASK_NAME,
692 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, 685 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION,
693 kOsDesktop, 686 kOsDesktop,
694 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) 687 MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
695 }, 688 },
696 #endif 689 #endif
697 { 690 {
698 "extension-apis", // FLAGS:RECORD_UMA 691 "extension-apis", // FLAGS:RECORD_UMA
699 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 692 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
(...skipping 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 } 2482 }
2490 2483
2491 const Experiment* GetExperiments(size_t* count) { 2484 const Experiment* GetExperiments(size_t* count) {
2492 *count = num_experiments; 2485 *count = num_experiments;
2493 return experiments; 2486 return experiments;
2494 } 2487 }
2495 2488
2496 } // namespace testing 2489 } // namespace testing
2497 2490
2498 } // namespace about_flags 2491 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/common/chrome_content_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698