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

Unified Diff: chrome/browser/about_flags.cc

Issue 15679014: Add --enable-webkit-media-source for Android instead of hardcoding it to be disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add chrome bits Created 7 years, 7 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') | content/browser/renderer_host/render_process_host_impl.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 fa07c5d368d47d4ce34801fc3b1ad51172591434..894029f5ef86d5272912b50ccd1453b3155a63a2 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -695,6 +695,15 @@ const Experiment kExperiments[] = {
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
switches::kDisableAsyncDns)
},
+#if defined(ANDROID) && !defined(GOOGLE_TV)
+ {
+ "enable-media-source",
+ IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_NAME,
+ IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
+ kOsAll,
+ SINGLE_VALUE_TYPE(switches::kEnableWebKitMediaSource)
+ },
+#else
{
"disable-media-source",
IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME,
@@ -702,6 +711,7 @@ const Experiment kExperiments[] = {
kOsAll,
SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource)
},
+#endif
{
"disable-encrypted-media",
IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698