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

Unified Diff: content/renderer/render_thread_impl.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 | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 9b7524af4a21da31d78ae81f15c2b08da7e478ed..daa8ebfe9e9834ea67d7f38deca7b3c9a1e94a57 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -678,7 +678,10 @@ static void AdjustRuntimeFeaturesFromArgs(const CommandLine& command_line) {
if (command_line.HasSwitch(switches::kDisableGeolocation))
WebRuntimeFeatures::enableGeolocation(false);
-#if !defined(OS_ANDROID) || defined(GOOGLE_TV)
+#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
+ if (command_line.HasSwitch(switches::kEnableWebKitMediaSource))
+ WebRuntimeFeatures::enableWebKitMediaSource(true);
+#else
if (command_line.HasSwitch(switches::kDisableWebKitMediaSource))
WebRuntimeFeatures::enableWebKitMediaSource(false);
#endif
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698