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 e9117ccd4e329ddf8beb38646f45cf460408e129..752ec3c0342f33a1027002a6353c6c376293a9b2 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), |
@@ -121,6 +123,15 @@ WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler( |
return peer_connection_handler_; |
} |
+WebKit::WebMediaStreamCenter* MediaStreamImpl::CreateMediaStreamCenter( |
+ WebKit::WebMediaStreamCenterClient* client) { |
+ DCHECK(CalledOnValidThread()); |
+ DCHECK(!media_stream_center_); |
+ |
+ media_stream_center_ = new MediaStreamCenter(client); |
tommi (sloooow) - chröme
2012/02/03 14:39:45
why do we hold on to the pointer?
Isn't the owners
tommyw
2012/02/03 14:58:25
Eventually MediaStreamImpl (aka the glue code) nee
|
+ return media_stream_center_; |
+} |
+ |
void MediaStreamImpl::ClosePeerConnection() { |
DCHECK(CalledOnValidThread()); |
video_renderer_ = NULL; |