| Index: content/browser/renderer_host/media/video_capture_host.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
|
| index d3192d621fed558d09d28cae9c3630e23e7a53d5..65be7a358385796c5d6925deb42ab144a9988535 100644
|
| --- a/content/browser/renderer_host/media/video_capture_host.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_host.cc
|
| @@ -6,9 +6,14 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/stl_util.h"
|
| +#include "content/browser/renderer_host/media/media_stream_manager.h"
|
| +#include "content/browser/resource_context.h"
|
| #include "content/common/media/video_capture_messages.h"
|
|
|
| -VideoCaptureHost::VideoCaptureHost() {}
|
| +VideoCaptureHost::VideoCaptureHost(
|
| + const content::ResourceContext* resource_context)
|
| + : resource_context_(resource_context) {
|
| +}
|
|
|
| VideoCaptureHost::~VideoCaptureHost() {}
|
|
|
| @@ -147,7 +152,9 @@ void VideoCaptureHost::OnStartCapture(int device_id,
|
| DCHECK(entries_.find(controller_id) == entries_.end());
|
|
|
| scoped_refptr<VideoCaptureController> controller =
|
| - new VideoCaptureController(controller_id, peer_handle(), this);
|
| + new VideoCaptureController(
|
| + controller_id, peer_handle(), this,
|
| + resource_context_->media_stream_manager()->video_capture_manager());
|
| entries_.insert(std::make_pair(controller_id, controller));
|
| controller->StartCapture(params);
|
| }
|
|
|