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

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: REBASE 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
« no previous file with comments | « 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') | Show Comments 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..e090c0d8510bb9295d6b4acd7cbc08b25e790110 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_DEVICE_AUDIO_CAPTURE;
case PP_DEVICETYPE_DEV_VIDEOCAPTURE:
- return MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+ return MEDIA_DEVICE_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_DEVICE_AUDIO_CAPTURE:
return PP_DEVICETYPE_DEV_AUDIOCAPTURE;
- case MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:
+ case MEDIA_DEVICE_VIDEO_CAPTURE:
return PP_DEVICETYPE_DEV_VIDEOCAPTURE;
default:
NOTREACHED();
« no previous file with comments | « content/renderer/media/mock_media_stream_dispatcher.cc ('k') | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698