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

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

Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 2 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
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/android/chrome_feature_list.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 722 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
723 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 723 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
724 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 724 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
725 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 725 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
726 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 726 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
727 #endif 727 #endif
728 #if defined(OS_ANDROID) 728 #if defined(OS_ANDROID)
729 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 729 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
730 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 730 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
731 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 731 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
732 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
733 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
734 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)},
732 #endif 735 #endif
733 // Native client is compiled out when DISABLE_NACL is defined. 736 // Native client is compiled out when DISABLE_NACL is defined.
734 #if !defined(DISABLE_NACL) 737 #if !defined(DISABLE_NACL)
735 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 738 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
736 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 739 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
737 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME, 740 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME,
738 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 741 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
739 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 742 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
740 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 743 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
741 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop, 744 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop,
(...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after
2299 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2302 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2300 2303
2301 const FeatureEntry* GetFeatureEntries(size_t* count) { 2304 const FeatureEntry* GetFeatureEntries(size_t* count) {
2302 *count = arraysize(kFeatureEntries); 2305 *count = arraysize(kFeatureEntries);
2303 return kFeatureEntries; 2306 return kFeatureEntries;
2304 } 2307 }
2305 2308
2306 } // namespace testing 2309 } // namespace testing
2307 2310
2308 } // namespace about_flags 2311 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/android/chrome_feature_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698