| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/native/permission/media_access_permission_request.h" | 5 #include "android_webview/native/permission/media_access_permission_request.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "android_webview/native/permission/aw_permission_request.h" | 9 #include "android_webview/native/permission/aw_permission_request.h" |
| 8 #include "content/public/browser/media_capture_devices.h" | 10 #include "content/public/browser/media_capture_devices.h" |
| 9 | 11 |
| 10 using content::MediaCaptureDevices; | 12 using content::MediaCaptureDevices; |
| 11 using content::MediaStreamDevice; | 13 using content::MediaStreamDevice; |
| 12 using content::MediaStreamDevices; | 14 using content::MediaStreamDevices; |
| 13 | 15 |
| 14 namespace android_webview { | 16 namespace android_webview { |
| 15 | 17 |
| 16 namespace { | 18 namespace { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 42 callback_(callback) { | 44 callback_(callback) { |
| 43 } | 45 } |
| 44 | 46 |
| 45 MediaAccessPermissionRequest::~MediaAccessPermissionRequest() { | 47 MediaAccessPermissionRequest::~MediaAccessPermissionRequest() { |
| 46 } | 48 } |
| 47 | 49 |
| 48 void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) { | 50 void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) { |
| 49 scoped_ptr<content::MediaStreamUI> ui; | 51 scoped_ptr<content::MediaStreamUI> ui; |
| 50 MediaStreamDevices devices; | 52 MediaStreamDevices devices; |
| 51 if (!allowed) { | 53 if (!allowed) { |
| 52 callback_.Run(devices, content::MEDIA_DEVICE_PERMISSION_DENIED, ui.Pass()); | 54 callback_.Run(devices, content::MEDIA_DEVICE_PERMISSION_DENIED, |
| 55 std::move(ui)); |
| 53 return; | 56 return; |
| 54 } | 57 } |
| 55 | 58 |
| 56 if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) { | 59 if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) { |
| 57 const MediaStreamDevices& audio_devices = audio_test_devices_.empty()? | 60 const MediaStreamDevices& audio_devices = audio_test_devices_.empty()? |
| 58 MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() : | 61 MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() : |
| 59 audio_test_devices_; | 62 audio_test_devices_; |
| 60 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( | 63 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( |
| 61 audio_devices, request_.requested_audio_device_id); | 64 audio_devices, request_.requested_audio_device_id); |
| 62 if (device) | 65 if (device) |
| 63 devices.push_back(*device); | 66 devices.push_back(*device); |
| 64 } | 67 } |
| 65 | 68 |
| 66 if (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) { | 69 if (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) { |
| 67 const MediaStreamDevices& video_devices = video_test_devices_.empty()? | 70 const MediaStreamDevices& video_devices = video_test_devices_.empty()? |
| 68 MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices() : | 71 MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices() : |
| 69 video_test_devices_; | 72 video_test_devices_; |
| 70 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( | 73 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( |
| 71 video_devices, request_.requested_video_device_id); | 74 video_devices, request_.requested_video_device_id); |
| 72 if (device) | 75 if (device) |
| 73 devices.push_back(*device); | 76 devices.push_back(*device); |
| 74 } | 77 } |
| 75 callback_.Run(devices, devices.empty() ? | 78 callback_.Run(devices, devices.empty() ? content::MEDIA_DEVICE_NO_HARDWARE |
| 76 content::MEDIA_DEVICE_NO_HARDWARE : content::MEDIA_DEVICE_OK, | 79 : content::MEDIA_DEVICE_OK, |
| 77 ui.Pass()); | 80 std::move(ui)); |
| 78 } | 81 } |
| 79 | 82 |
| 80 const GURL& MediaAccessPermissionRequest::GetOrigin() { | 83 const GURL& MediaAccessPermissionRequest::GetOrigin() { |
| 81 return request_.security_origin; | 84 return request_.security_origin; |
| 82 } | 85 } |
| 83 | 86 |
| 84 int64_t MediaAccessPermissionRequest::GetResources() { | 87 int64_t MediaAccessPermissionRequest::GetResources() { |
| 85 return (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE ? | 88 return (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE ? |
| 86 AwPermissionRequest::AudioCapture : 0) | | 89 AwPermissionRequest::AudioCapture : 0) | |
| 87 (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ? | 90 (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ? |
| 88 AwPermissionRequest::VideoCapture : 0); | 91 AwPermissionRequest::VideoCapture : 0); |
| 89 } | 92 } |
| 90 | 93 |
| 91 } // namespace android_webview | 94 } // namespace android_webview |
| OLD | NEW |