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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 12079084: Add command line switch --enable-webrtc on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: code review Created 7 years, 11 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') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
===================================================================
--- content/renderer/render_thread_impl.cc (revision 179784)
+++ content/renderer/render_thread_impl.cc (working copy)
@@ -657,8 +657,15 @@
WebRuntimeFeatures::enableMediaPlayer(
media::IsMediaLibraryInitialized());
+#if defined(OS_ANDROID)
+ WebKit::WebRuntimeFeatures::enableMediaStream(
+ command_line.HasSwitch(switches::kEnableWebRTC));
+ WebKit::WebRuntimeFeatures::enablePeerConnection(
+ command_line.HasSwitch(switches::kEnableWebRTC));
+#else
WebKit::WebRuntimeFeatures::enableMediaStream(true);
WebKit::WebRuntimeFeatures::enablePeerConnection(true);
+#endif
WebKit::WebRuntimeFeatures::enableFullScreenAPI(
!command_line.HasSwitch(switches::kDisableFullScreen));
@@ -1096,6 +1103,12 @@
WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter(
WebKit::WebMediaStreamCenterClient* client) {
+#if defined(OS_ANDROID)
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableWebRTC))
+ return NULL;
+#endif
+
#if defined(ENABLE_WEBRTC)
if (!media_stream_center_)
media_stream_center_ = new MediaStreamCenter(
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698