OLD | NEW |
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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 624 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
625 #endif | 625 #endif |
626 // Native client is compiled out when DISABLE_NACL is defined. | 626 // Native client is compiled out when DISABLE_NACL is defined. |
627 #if !defined(DISABLE_NACL) | 627 #if !defined(DISABLE_NACL) |
628 {"enable-nacl", // FLAGS:RECORD_UMA | 628 {"enable-nacl", // FLAGS:RECORD_UMA |
629 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 629 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
630 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 630 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
631 {"enable-nacl-debug", // FLAGS:RECORD_UMA | 631 {"enable-nacl-debug", // FLAGS:RECORD_UMA |
632 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 632 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
633 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 633 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, |
| 634 {"force-pnacl-subzero", |
| 635 IDS_FLAGS_PNACL_SUBZERO_NAME, |
| 636 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop, |
| 637 SINGLE_VALUE_TYPE(switches::kForcePNaClSubzero)}, |
634 {"nacl-debug-mask", // FLAGS:RECORD_UMA | 638 {"nacl-debug-mask", // FLAGS:RECORD_UMA |
635 IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, | 639 IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |
636 kOsDesktop, MULTI_VALUE_TYPE(kNaClDebugMaskChoices)}, | 640 kOsDesktop, MULTI_VALUE_TYPE(kNaClDebugMaskChoices)}, |
637 #endif | 641 #endif |
638 #if defined(ENABLE_EXTENSIONS) | 642 #if defined(ENABLE_EXTENSIONS) |
639 {"extension-apis", // FLAGS:RECORD_UMA | 643 {"extension-apis", // FLAGS:RECORD_UMA |
640 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, | 644 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
641 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, kOsDesktop, | 645 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, kOsDesktop, |
642 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)}, | 646 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)}, |
643 {"extensions-on-chrome-urls", IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, | 647 {"extensions-on-chrome-urls", IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, |
(...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2034 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2038 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2035 | 2039 |
2036 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2040 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2037 *count = arraysize(kFeatureEntries); | 2041 *count = arraysize(kFeatureEntries); |
2038 return kFeatureEntries; | 2042 return kFeatureEntries; |
2039 } | 2043 } |
2040 | 2044 |
2041 } // namespace testing | 2045 } // namespace testing |
2042 | 2046 |
2043 } // namespace about_flags | 2047 } // namespace about_flags |
OLD | NEW |