content/renderer/media/media_stream_dispatcher.h - Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing

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/renderer/media/media_stream_dispatcher.h

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Renamed MEDIA_USER_*_CAPTURE to MEDIA_*_DEVICE_CAPTURE, as suggested by wjia@. Created 8 years, 3 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_manager.cc ('K') | « content/public/common/media_stream_request.cc ('k') | content/renderer/media/media_stream_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_dispatcher.h

diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h

index 549807eb6f9704645807f5030d4b3294e2d31970..9f06885f069b03a11bfe7d8650b34009e2f0e1c8 100644

--- a/content/renderer/media/media_stream_dispatcher.h

+++ b/content/renderer/media/media_stream_dispatcher.h

@@ -152,8 +152,7 @@ class CONTENT_EXPORT MediaStreamDispatcher

typedef std::map<std::string, Stream> LabelStreamMap;

LabelStreamMap label_stream_map_;

- EnumerationState audio_enumeration_state_;

- EnumerationState video_enumeration_state_;

+ EnumerationState enumeration_state_[content::NUM_MEDIA_TYPES];

// List of calls made to GenerateStream that has not yet completed.

typedef std::list<Request> RequestList;