Index: content/renderer/media/media_stream_impl.cc |
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc |
index 0a3444746972f838cf73392a9e24b96d0b5994a6..545bf2f6bcb80a902f774fd36ee50771df468c23 100644 |
--- a/content/renderer/media/media_stream_impl.cc |
+++ b/content/renderer/media/media_stream_impl.cc |
@@ -11,6 +11,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "base/utf_string_conversions.h" |
#include "content/renderer/media/capture_video_decoder.h" |
+#include "content/renderer/media/media_stream_center.h" |
#include "content/renderer/media/media_stream_dependency_factory.h" |
#include "content/renderer/media/media_stream_dispatcher.h" |
#include "content/renderer/media/peer_connection_handler.h" |
@@ -81,6 +82,7 @@ MediaStreamImpl::MediaStreamImpl( |
network_manager_(NULL), |
vc_manager_(vc_manager), |
peer_connection_handler_(NULL), |
+ media_stream_center_(NULL), |
message_loop_proxy_(base::MessageLoopProxy::current()), |
signaling_thread_(NULL), |
worker_thread_(NULL), |
@@ -125,6 +127,15 @@ WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler( |
return peer_connection_handler_; |
} |
+WebKit::WebMediaStreamCenter* MediaStreamImpl::CreateMediaStreamCenter( |
+ WebKit::WebMediaStreamCenterClient* client) { |
+ DCHECK(CalledOnValidThread()); |
+ DCHECK(!media_stream_center_); |
piman
2012/02/08 01:52:24
I haven't seen the webkit side, but what ensures t
tommyw
2012/02/08 13:14:18
The corresponding WebKit object MediaStreamCenter
|
+ |
+ media_stream_center_ = new MediaStreamCenter(client); |
+ return media_stream_center_; |
+} |
+ |
void MediaStreamImpl::ClosePeerConnection() { |
DCHECK(CalledOnValidThread()); |
video_renderer_ = NULL; |