Skip to content

Commit

Permalink
enable the screen capture support for getUserMedia
Browse files Browse the repository at this point in the history
Fix #576
  • Loading branch information
rogerwang committed Aug 13, 2013
1 parent 410a535 commit e223119
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/media/media_stream_devices_controller.cc
Expand Up @@ -66,7 +66,8 @@ bool MediaStreamDevicesController::DismissInfoBarAndTakeActionOnSettings() {
}

if (request_.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE ||
request_.video_type == content::MEDIA_TAB_VIDEO_CAPTURE) {
request_.video_type == content::MEDIA_TAB_VIDEO_CAPTURE ||
request_.video_type == content::MEDIA_SCREEN_VIDEO_CAPTURE) {
HandleTapMediaRequest();
return true;
}
Expand Down Expand Up @@ -160,6 +161,10 @@ void MediaStreamDevicesController::HandleTapMediaRequest() {
devices.push_back(content::MediaStreamDevice(
content::MEDIA_TAB_AUDIO_CAPTURE, "", ""));
}
if (request_.video_type == content::MEDIA_SCREEN_VIDEO_CAPTURE) {
devices.push_back(content::MediaStreamDevice(
content::MEDIA_SCREEN_VIDEO_CAPTURE, std::string(), "Screen"));
}

callback_.Run(devices, scoped_ptr<content::MediaStreamUI>());
}
Expand Down

0 comments on commit e223119

Please sign in to comment.