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( |