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

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: rebase to #407492(Jul 25) 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 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 698 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
699 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 699 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
700 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 700 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
701 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 701 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
702 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 702 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
703 #endif 703 #endif
704 #if defined(OS_ANDROID) 704 #if defined(OS_ANDROID)
705 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 705 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
706 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 706 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
707 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 707 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
708 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
709 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
710 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)},
708 #endif 711 #endif
709 // Native client is compiled out when DISABLE_NACL is defined. 712 // Native client is compiled out when DISABLE_NACL is defined.
710 #if !defined(DISABLE_NACL) 713 #if !defined(DISABLE_NACL)
711 {"enable-nacl", // FLAGS:RECORD_UMA 714 {"enable-nacl", // FLAGS:RECORD_UMA
712 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 715 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
713 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 716 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
714 {"enable-nacl-debug", // FLAGS:RECORD_UMA 717 {"enable-nacl-debug", // FLAGS:RECORD_UMA
715 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 718 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
716 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 719 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
717 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 720 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2215 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2213 2216
2214 const FeatureEntry* GetFeatureEntries(size_t* count) { 2217 const FeatureEntry* GetFeatureEntries(size_t* count) {
2215 *count = arraysize(kFeatureEntries); 2218 *count = arraysize(kFeatureEntries);
2216 return kFeatureEntries; 2219 return kFeatureEntries;
2217 } 2220 }
2218 2221
2219 } // namespace testing 2222 } // namespace testing
2220 2223
2221 } // namespace about_flags 2224 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698