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

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: fix nits 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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 702 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
703 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, 703 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
704 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 704 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
705 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 705 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
706 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 706 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
707 #endif 707 #endif
708 #if defined(OS_ANDROID) 708 #if defined(OS_ANDROID)
709 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 709 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
710 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 710 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
711 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 711 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
712 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
713 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
714 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)},
Alexei Svitkine (slow) 2016/09/12 16:56:57 Have you considered using base::Feature instead?
braveyao 2016/09/12 23:23:20 Done.
712 #endif 715 #endif
713 // Native client is compiled out when DISABLE_NACL is defined. 716 // Native client is compiled out when DISABLE_NACL is defined.
714 #if !defined(DISABLE_NACL) 717 #if !defined(DISABLE_NACL)
715 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 718 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
716 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 719 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
717 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME, 720 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME,
718 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 721 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
719 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, 722 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
720 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME, 723 {"force-pnacl-subzero", IDS_FLAGS_PNACL_SUBZERO_NAME,
721 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop, 724 IDS_FLAGS_PNACL_SUBZERO_DESCRIPTION, kOsDesktop,
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
2064 IDS_FLAGS_ENABLE_EHV_INPUT_NAME, IDS_FLAGS_ENABLE_EHV_INPUT_DESCRIPTION, 2067 IDS_FLAGS_ENABLE_EHV_INPUT_NAME, IDS_FLAGS_ENABLE_EHV_INPUT_DESCRIPTION,
2065 kOsCrOS, FEATURE_VALUE_TYPE(features::kEHVInputOnImeMenu)}, 2068 kOsCrOS, FEATURE_VALUE_TYPE(features::kEHVInputOnImeMenu)},
2066 #endif 2069 #endif
2067 {"enable-gamepad-extensions", IDS_FLAGS_GAMEPAD_EXTENSIONS_NAME, 2070 {"enable-gamepad-extensions", IDS_FLAGS_GAMEPAD_EXTENSIONS_NAME,
2068 IDS_FLAGS_GAMEPAD_EXTENSIONS_DESCRIPTION, kOsAll, 2071 IDS_FLAGS_GAMEPAD_EXTENSIONS_DESCRIPTION, kOsAll,
2069 FEATURE_VALUE_TYPE(features::kGamepadExtensions)}, 2072 FEATURE_VALUE_TYPE(features::kGamepadExtensions)},
2070 #if defined(OS_CHROMEOS) 2073 #if defined(OS_CHROMEOS)
2071 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, 2074 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME,
2072 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, 2075 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS,
2073 SINGLE_VALUE_TYPE_AND_VALUE( 2076 SINGLE_VALUE_TYPE_AND_VALUE(
2074 chromeos::switches::kArcUseAuthEndpoint, 2077 chromeos::switches::kArcUseAuthEndpoint,
2075 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" \ 2078 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/"
2076 "ExchangeToken")}, 2079 "ExchangeToken")},
2077 #endif 2080 #endif
2078 // NOTE: Adding new command-line switches requires adding corresponding 2081 // NOTE: Adding new command-line switches requires adding corresponding
2079 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2082 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2080 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2083 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2081 }; 2084 };
2082 2085
2083 class FlagsStateSingleton { 2086 class FlagsStateSingleton {
2084 public: 2087 public:
2085 FlagsStateSingleton() 2088 FlagsStateSingleton()
2086 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 2089 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2250 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2253 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2251 2254
2252 const FeatureEntry* GetFeatureEntries(size_t* count) { 2255 const FeatureEntry* GetFeatureEntries(size_t* count) {
2253 *count = arraysize(kFeatureEntries); 2256 *count = arraysize(kFeatureEntries);
2254 return kFeatureEntries; 2257 return kFeatureEntries;
2255 } 2258 }
2256 2259
2257 } // namespace testing 2260 } // namespace testing
2258 2261
2259 } // namespace about_flags 2262 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/tab_web_contents_delegate_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698