Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(882)

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: Changes after review by xians@. 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
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..215f1e15edb78d75e8717c26397e5cc9c18c66fa 100644
--- a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
@@ -94,14 +94,14 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
PP_DeviceType_Dev type) {
switch (type) {
case PP_DEVICETYPE_DEV_INVALID:
- return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
+ return MEDIA_NO_SERVICE;
case PP_DEVICETYPE_DEV_AUDIOCAPTURE:
- return MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
+ return MEDIA_USER_AUDIO_CAPTURE;
case PP_DEVICETYPE_DEV_VIDEOCAPTURE:
- return MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+ return MEDIA_USER_VIDEO_CAPTURE;
default:
NOTREACHED();
- return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
+ return MEDIA_NO_SERVICE;
}
}
@@ -109,11 +109,11 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
PP_DeviceType_Dev PepperDeviceEnumerationEventHandler::FromMediaStreamType(
media_stream::MediaStreamType type) {
switch (type) {
- case MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE:
+ case MEDIA_NO_SERVICE:
return PP_DEVICETYPE_DEV_INVALID;
- case MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE:
+ case MEDIA_USER_AUDIO_CAPTURE:
return PP_DEVICETYPE_DEV_AUDIOCAPTURE;
- case MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:
+ case MEDIA_USER_VIDEO_CAPTURE:
return PP_DEVICETYPE_DEV_VIDEOCAPTURE;
default:
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698