content/browser/renderer_host/media/media_stream_manager.h - Issue 702703002: Revert of Win Video Capture: Create an STA |video_capture_thread_| from MediaStreamManager.

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/media_stream_manager.h

Issue 702703002: Revert of Win Video Capture: Create an STA |video_capture_thread_| from MediaStreamManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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

« no previous file with comments | « content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc ('k') | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_manager.h

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

index 9499e32f257581cbed967487d1744075582ce61b..78c722e713e28af58923680618496286f5d7100e 100644

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

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

@@ -37,7 +37,6 @@

#include "base/message_loop/message_loop.h"

#include "base/power_monitor/power_observer.h"

#include "base/system_monitor/system_monitor.h"

-#include "base/threading/thread.h"

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

#include "content/common/content_export.h"

#include "content/common/media/media_stream_options.h"

@@ -383,9 +382,6 @@

media::AudioManager* const audio_manager_; // not owned

scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;

scoped_refptr<VideoCaptureManager> video_capture_manager_;

-#if defined(OS_WIN)

- base::Thread video_capture_thread_;

-#endif

// Indicator of device monitoring state.

bool monitoring_started_;