content/renderer/pepper/pepper_device_enumeration_event_handler.cc - 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/pepper/pepper_device_enumeration_event_handler.cc

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: Created 8 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/public/common/media_stream_request.h ('K') | « content/renderer/media/mock_media_stream_dispatcher.cc ('k') | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_device_enumeration_event_handler.cc

diff --git a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc

index 3ea089c43cd9a9278d01a11a60045d6c20bcf702..e79c66cc827e0c7bd818336d8759de0be741ee9f 100644

--- a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc

+++ b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc

@@ -96,9 +96,9 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(

case PP_DEVICETYPE_DEV_INVALID:

return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;

case PP_DEVICETYPE_DEV_AUDIOCAPTURE:

- return MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;

+ return MEDIA_STREAM_DEVICE_TYPE_USER_AUDIO_CAPTURE;

case PP_DEVICETYPE_DEV_VIDEOCAPTURE:

- return MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;

+ return MEDIA_STREAM_DEVICE_TYPE_USER_VIDEO_CAPTURE;

default:

NOTREACHED();

return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;

@@ -111,9 +111,9 @@ PP_DeviceType_Dev PepperDeviceEnumerationEventHandler::FromMediaStreamType(

switch (type) {

case MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE:

return PP_DEVICETYPE_DEV_INVALID;

- case MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE:

+ case MEDIA_STREAM_DEVICE_TYPE_USER_AUDIO_CAPTURE:

return PP_DEVICETYPE_DEV_AUDIOCAPTURE;

- case MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:

+ case MEDIA_STREAM_DEVICE_TYPE_USER_VIDEO_CAPTURE:

return PP_DEVICETYPE_DEV_VIDEOCAPTURE;

default:

NOTREACHED();