content/browser/renderer_host/media/video_capture_host.h - Issue 17508005: Minor cleanup to remove the static thread-safe methods on BrowserMainLoop. Initially I thought this…

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 17508005: Minor cleanup to remove the static thread-safe methods on BrowserMainLoop. Initially I thought this… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 6 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/media_devices_monitor.cc ('K') | « content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.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

===================================================================

--- content/browser/renderer_host/media/video_capture_host.h (revision 207505)

+++ content/browser/renderer_host/media/video_capture_host.h (working copy)

@@ -46,12 +46,13 @@

#include "ipc/ipc_message.h"

namespace content {

+class MediaStreamManager;

class CONTENT_EXPORT VideoCaptureHost

: public BrowserMessageFilter,

public VideoCaptureControllerEventHandler {

public:

- VideoCaptureHost();

+ explicit VideoCaptureHost(MediaStreamManager* media_stream_manager);

// BrowserMessageFilter implementation.

virtual void OnChannelClosing() OVERRIDE;

@@ -133,9 +134,7 @@

void DeleteVideoCaptureControllerOnIOThread(

const VideoCaptureControllerID& controller_id);

- // Returns the video capture manager. This is a virtual function so that

- // the unit tests can inject their own MediaStreamManager.

- virtual VideoCaptureManager* GetVideoCaptureManager();

+ MediaStreamManager* media_stream_manager_;

struct Entry;

typedef std::map<VideoCaptureControllerID, Entry*> EntryMap;