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

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: Created 4 years, 5 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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 661 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
662 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 662 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
663 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 663 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
664 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 664 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
665 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 665 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
666 #endif 666 #endif
667 #if defined(OS_ANDROID) 667 #if defined(OS_ANDROID)
668 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 668 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
669 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 669 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
670 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 670 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
671 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
672 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
673 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)},
671 #endif 674 #endif
672 // Native client is compiled out when DISABLE_NACL is defined. 675 // Native client is compiled out when DISABLE_NACL is defined.
673 #if !defined(DISABLE_NACL) 676 #if !defined(DISABLE_NACL)
674 {"enable-nacl", // FLAGS:RECORD_UMA 677 {"enable-nacl", // FLAGS:RECORD_UMA
675 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 678 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
676 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 679 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
677 {"enable-nacl-debug", // FLAGS:RECORD_UMA 680 {"enable-nacl-debug", // FLAGS:RECORD_UMA
678 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 681 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
679 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 682 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
680 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 683 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
(...skipping 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after
2160 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2163 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2161 2164
2162 const FeatureEntry* GetFeatureEntries(size_t* count) { 2165 const FeatureEntry* GetFeatureEntries(size_t* count) {
2163 *count = arraysize(kFeatureEntries); 2166 *count = arraysize(kFeatureEntries);
2164 return kFeatureEntries; 2167 return kFeatureEntries;
2165 } 2168 }
2166 2169
2167 } // namespace testing 2170 } // namespace testing
2168 2171
2169 } // namespace about_flags 2172 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698