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 |