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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 718 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
719 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 719 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
720 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 720 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
721 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 721 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
722 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 722 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
723 #endif | 723 #endif |
724 #if defined(OS_ANDROID) | 724 #if defined(OS_ANDROID) |
725 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, | 725 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
726 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, | 726 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, |
727 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 727 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
| 728 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME, |
| 729 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid, |
| 730 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)}, |
728 #endif | 731 #endif |
729 // Native client is compiled out when DISABLE_NACL is defined. | 732 // Native client is compiled out when DISABLE_NACL is defined. |
730 #if !defined(DISABLE_NACL) | 733 #if !defined(DISABLE_NACL) |
731 {"enable-nacl", // FLAGS:RECORD_UMA | 734 {"enable-nacl", // FLAGS:RECORD_UMA |
732 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 735 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
733 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 736 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
734 {"enable-nacl-debug", // FLAGS:RECORD_UMA | 737 {"enable-nacl-debug", // FLAGS:RECORD_UMA |
735 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 738 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
736 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 739 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, |
737 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, | 740 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, |
(...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2235 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2238 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2236 | 2239 |
2237 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2240 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2238 *count = arraysize(kFeatureEntries); | 2241 *count = arraysize(kFeatureEntries); |
2239 return kFeatureEntries; | 2242 return kFeatureEntries; |
2240 } | 2243 } |
2241 | 2244 |
2242 } // namespace testing | 2245 } // namespace testing |
2243 | 2246 |
2244 } // namespace about_flags | 2247 } // namespace about_flags |
OLD | NEW |