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

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 in components/content_settings/ 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 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 657 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
658 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 658 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
659 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 659 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
660 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 660 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
661 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 661 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
662 #endif 662 #endif
663 #if defined(OS_ANDROID) 663 #if defined(OS_ANDROID)
664 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 664 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
665 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 665 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
666 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 666 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
667 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
668 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
669 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)},
667 #endif 670 #endif
668 // Native client is compiled out when DISABLE_NACL is defined. 671 // Native client is compiled out when DISABLE_NACL is defined.
669 #if !defined(DISABLE_NACL) 672 #if !defined(DISABLE_NACL)
670 {"enable-nacl", // FLAGS:RECORD_UMA 673 {"enable-nacl", // FLAGS:RECORD_UMA
671 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 674 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
672 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 675 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
673 {"enable-nacl-debug", // FLAGS:RECORD_UMA 676 {"enable-nacl-debug", // FLAGS:RECORD_UMA
674 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 677 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
675 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 678 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
676 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 679 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
(...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2145 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2143 2146
2144 const FeatureEntry* GetFeatureEntries(size_t* count) { 2147 const FeatureEntry* GetFeatureEntries(size_t* count) {
2145 *count = arraysize(kFeatureEntries); 2148 *count = arraysize(kFeatureEntries);
2146 return kFeatureEntries; 2149 return kFeatureEntries;
2147 } 2150 }
2148 2151
2149 } // namespace testing 2152 } // namespace testing
2150 2153
2151 } // namespace about_flags 2154 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698