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