content/browser/renderer_host/media/video_capture_host.h - 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.h

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: Changing unit tests based on review by scherkus. 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/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | content/browser/renderer_host/media/video_capture_host.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.h

diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h

index 335ee4b1a6538810fe5fc1f7760b6e75d2f9a97f..e0c086956554ab0fa0580f62d288ffd3fd164d67 100644

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

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

@@ -43,11 +43,15 @@

#include "content/browser/renderer_host/media/video_capture_controller.h"

#include "ipc/ipc_message.h"

+namespace content {

+class ResourceContext;

+} // namespace content

class VideoCaptureHost

: public BrowserMessageFilter,

public VideoCaptureControllerEventHandler {

public:

- VideoCaptureHost();

+ VideoCaptureHost(const content::ResourceContext* resource_context);

// BrowserMessageFilter implementation.

virtual void OnChannelClosing();

@@ -127,6 +131,9 @@ class VideoCaptureHost

// objects that is currently active.

EntryMap entries_;

+ // Used to get a pointer to VideoCaptureManager to start/stop capture devices.

+ const content::ResourceContext* resource_context_;

DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);

};