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

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: add entry in LoginCustomFlags as bots request Created 4 years, 3 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 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 724 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
725 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 725 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
726 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 726 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
727 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 727 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
728 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 728 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
729 #endif 729 #endif
730 #if defined(OS_ANDROID) 730 #if defined(OS_ANDROID)
731 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 731 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
732 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 732 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
733 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 733 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
734 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
735 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
736 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)},
734 #endif 737 #endif
735 // Native client is compiled out when DISABLE_NACL is defined. 738 // Native client is compiled out when DISABLE_NACL is defined.
736 #if !defined(DISABLE_NACL) 739 #if !defined(DISABLE_NACL)
737 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 740 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
738 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 741 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
739 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME, 742 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME,
740 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 743 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
741 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 744 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
742 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 745 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
743 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop, 746 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop,
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after
2305 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2308 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2306 2309
2307 const FeatureEntry* GetFeatureEntries(size_t* count) { 2310 const FeatureEntry* GetFeatureEntries(size_t* count) {
2308 *count = arraysize(kFeatureEntries); 2311 *count = arraysize(kFeatureEntries);
2309 return kFeatureEntries; 2312 return kFeatureEntries;
2310 } 2313 }
2311 2314
2312 } // namespace testing 2315 } // namespace testing
2313 2316
2314 } // namespace about_flags 2317 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698