| 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/browser/permission/media_access_permission_request.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/native/permission/aw_permission_request.h" | 9 #include "android_webview/browser/permission/aw_permission_request.h" |
| 10 #include "content/public/browser/media_capture_devices.h" | 10 #include "content/public/browser/media_capture_devices.h" |
| 11 | 11 |
| 12 using content::MediaCaptureDevices; | 12 using content::MediaCaptureDevices; |
| 13 using content::MediaStreamDevice; | 13 using content::MediaStreamDevice; |
| 14 using content::MediaStreamDevices; | 14 using content::MediaStreamDevices; |
| 15 | 15 |
| 16 namespace android_webview { | 16 namespace android_webview { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 33 } | 33 } |
| 34 | 34 |
| 35 return &devices[0]; | 35 return &devices[0]; |
| 36 } | 36 } |
| 37 | 37 |
| 38 } // namespace | 38 } // namespace |
| 39 | 39 |
| 40 MediaAccessPermissionRequest::MediaAccessPermissionRequest( | 40 MediaAccessPermissionRequest::MediaAccessPermissionRequest( |
| 41 const content::MediaStreamRequest& request, | 41 const content::MediaStreamRequest& request, |
| 42 const content::MediaResponseCallback& callback) | 42 const content::MediaResponseCallback& callback) |
| 43 : request_(request), | 43 : request_(request), callback_(callback) {} |
| 44 callback_(callback) { | |
| 45 } | |
| 46 | 44 |
| 47 MediaAccessPermissionRequest::~MediaAccessPermissionRequest() { | 45 MediaAccessPermissionRequest::~MediaAccessPermissionRequest() {} |
| 48 } | |
| 49 | 46 |
| 50 void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) { | 47 void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) { |
| 51 std::unique_ptr<content::MediaStreamUI> ui; | 48 std::unique_ptr<content::MediaStreamUI> ui; |
| 52 MediaStreamDevices devices; | 49 MediaStreamDevices devices; |
| 53 if (!allowed) { | 50 if (!allowed) { |
| 54 callback_.Run(devices, content::MEDIA_DEVICE_PERMISSION_DENIED, | 51 callback_.Run(devices, content::MEDIA_DEVICE_PERMISSION_DENIED, |
| 55 std::move(ui)); | 52 std::move(ui)); |
| 56 return; | 53 return; |
| 57 } | 54 } |
| 58 | 55 |
| 59 if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) { | 56 if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) { |
| 60 const MediaStreamDevices& audio_devices = audio_test_devices_.empty()? | 57 const MediaStreamDevices& audio_devices = |
| 61 MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() : | 58 audio_test_devices_.empty() |
| 62 audio_test_devices_; | 59 ? MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() |
| 60 : audio_test_devices_; |
| 63 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( | 61 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( |
| 64 audio_devices, request_.requested_audio_device_id); | 62 audio_devices, request_.requested_audio_device_id); |
| 65 if (device) | 63 if (device) |
| 66 devices.push_back(*device); | 64 devices.push_back(*device); |
| 67 } | 65 } |
| 68 | 66 |
| 69 if (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) { | 67 if (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) { |
| 70 const MediaStreamDevices& video_devices = video_test_devices_.empty()? | 68 const MediaStreamDevices& video_devices = |
| 71 MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices() : | 69 video_test_devices_.empty() |
| 72 video_test_devices_; | 70 ? MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices() |
| 71 : video_test_devices_; |
| 73 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( | 72 const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable( |
| 74 video_devices, request_.requested_video_device_id); | 73 video_devices, request_.requested_video_device_id); |
| 75 if (device) | 74 if (device) |
| 76 devices.push_back(*device); | 75 devices.push_back(*device); |
| 77 } | 76 } |
| 78 callback_.Run(devices, devices.empty() ? content::MEDIA_DEVICE_NO_HARDWARE | 77 callback_.Run(devices, |
| 79 : content::MEDIA_DEVICE_OK, | 78 devices.empty() ? content::MEDIA_DEVICE_NO_HARDWARE |
| 79 : content::MEDIA_DEVICE_OK, |
| 80 std::move(ui)); | 80 std::move(ui)); |
| 81 } | 81 } |
| 82 | 82 |
| 83 const GURL& MediaAccessPermissionRequest::GetOrigin() { | 83 const GURL& MediaAccessPermissionRequest::GetOrigin() { |
| 84 return request_.security_origin; | 84 return request_.security_origin; |
| 85 } | 85 } |
| 86 | 86 |
| 87 int64_t MediaAccessPermissionRequest::GetResources() { | 87 int64_t MediaAccessPermissionRequest::GetResources() { |
| 88 return (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE ? | 88 return (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE |
| 89 AwPermissionRequest::AudioCapture : 0) | | 89 ? AwPermissionRequest::AudioCapture |
| 90 (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ? | 90 : 0) | |
| 91 AwPermissionRequest::VideoCapture : 0); | 91 (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE |
| 92 ? AwPermissionRequest::VideoCapture |
| 93 : 0); |
| 92 } | 94 } |
| 93 | 95 |
| 94 } // namespace android_webview | 96 } // namespace android_webview |
| OLD | NEW |