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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d3d02daa8a8aac7845d666e6fc21dcbfa59eabc5..146aa9092f911d80dd6f4709d0ecb6056cd0be56 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -709,6 +709,9 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
+ {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
+ IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
+ 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.
#endif
// Native client is compiled out when DISABLE_NACL is defined.
#if !defined(DISABLE_NACL)
@@ -2071,9 +2074,9 @@ const FeatureEntry kFeatureEntries[] = {
{"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME,
IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS,
SINGLE_VALUE_TYPE_AND_VALUE(
- chromeos::switches::kArcUseAuthEndpoint,
- "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" \
- "ExchangeToken")},
+ chromeos::switches::kArcUseAuthEndpoint,
+ "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/"
+ "ExchangeToken")},
#endif
// NOTE: Adding new command-line switches requires adding corresponding
// entries to enum "LoginCustomFlags" in histograms.xml. See note in
« 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