content/browser/renderer_host/media/video_capture_host.cc - Issue 7649016: Removing singleton property of MediaStreamManager and creating thread first when needed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Reverted parts of previous upload. 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

« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/video_capture_host.h ('k') | content/browser/renderer_host/media/video_capture_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..7d7774efd4dd6a9510c21b16f6e68cb7384b7534 100644

--- a/content/browser/renderer_host/media/video_capture_host.cc

+++ b/content/browser/renderer_host/media/video_capture_host.cc

@@ -8,7 +8,10 @@

#include "base/stl_util.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 +150,8 @@ 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_);

entries_.insert(std::make_pair(controller_id, controller));

controller->StartCapture(params);

}