Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index d3d02daa8a8aac7845d666e6fc21dcbfa59eabc5..891407bc1dc324f75ee497ca157ec3ab57f3af8e 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, |
+ FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, |
#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 |