Chromium Code Reviews| Index: content/renderer/render_thread_impl.cc |
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
| index 8f9bb72bccdbf9578fc197063fa1cf088a513ab0..94c8092859a488a5ddbfb40b485d4e0fd5d2486e 100644 |
| --- a/content/renderer/render_thread_impl.cc |
| +++ b/content/renderer/render_thread_impl.cc |
| @@ -64,6 +64,7 @@ |
| #include "content/renderer/media/audio_message_filter.h" |
| #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| #include "content/renderer/media/media_stream_center.h" |
| +#include "content/renderer/media/media_stream_dependency_factory.h" |
| #include "content/renderer/media/video_capture_impl_manager.h" |
| #include "content/renderer/media/video_capture_message_filter.h" |
| #include "content/renderer/plugin_channel_host.h" |
| @@ -1109,6 +1110,15 @@ WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( |
| return media_stream_center_; |
| } |
| +MediaStreamDependencyFactory* |
| +RenderThreadImpl::GetMediaStreamDependencyFactory() { |
| + if (!media_stream_factory_.get()) { |
|
piman
2012/09/06 17:04:45
nit: no need for braces.
perkj_chrome
2012/09/12 13:54:38
now its needed....
|
| + media_stream_factory_.reset(new MediaStreamDependencyFactory(vc_manager_)); |
| + } |
| + return media_stream_factory_.get(); |
| +} |
| + |
|
darin (slow to review)
2012/09/06 18:24:59
nit: only one new line here
perkj_chrome
2012/09/12 13:54:39
Done.
|
| + |
| GpuChannelHost* RenderThreadImpl::GetGpuChannel() { |
| if (!gpu_channel_.get()) |
| return NULL; |