Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: content/browser/renderer_host/media/video_capture_host.cc

Issue 7649016: Removing singleton property of MediaStreamManager and creating thread first when needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use VideoCaptureManager, instead of ResourceContext, in VideoCaptureController. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698