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

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, 4 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
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 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 719 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
720 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 720 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
721 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 721 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
722 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 722 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
723 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 723 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
724 #endif 724 #endif
725 #if defined(OS_ANDROID) 725 #if defined(OS_ANDROID)
726 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 726 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
727 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 727 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
728 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 728 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
729 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
730 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
731 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)},
729 #endif 732 #endif
730 // Native client is compiled out when DISABLE_NACL is defined. 733 // Native client is compiled out when DISABLE_NACL is defined.
731 #if !defined(DISABLE_NACL) 734 #if !defined(DISABLE_NACL)
732 {"enable-nacl", // FLAGS:RECORD_UMA 735 {"enable-nacl", // FLAGS:RECORD_UMA
733 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 736 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
734 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 737 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
735 {"enable-nacl-debug", // FLAGS:RECORD_UMA 738 {"enable-nacl-debug", // FLAGS:RECORD_UMA
736 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 739 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
737 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 740 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
738 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 741 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
2249 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2252 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2250 2253
2251 const FeatureEntry* GetFeatureEntries(size_t* count) { 2254 const FeatureEntry* GetFeatureEntries(size_t* count) {
2252 *count = arraysize(kFeatureEntries); 2255 *count = arraysize(kFeatureEntries);
2253 return kFeatureEntries; 2256 return kFeatureEntries;
2254 } 2257 }
2255 2258
2256 } // namespace testing 2259 } // namespace testing
2257 2260
2258 } // namespace about_flags 2261 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698