| 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> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/native/permission/aw_permission_request.h" | 9 #include "android_webview/native/permission/aw_permission_request.h" |
| 10 #include "content/public/browser/media_capture_devices.h" | 10 #include "content/public/browser/media_capture_devices.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 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), |
| 44 callback_(callback) { | 44 callback_(callback) { |
| 45 } | 45 } |
| 46 | 46 |
| 47 MediaAccessPermissionRequest::~MediaAccessPermissionRequest() { | 47 MediaAccessPermissionRequest::~MediaAccessPermissionRequest() { |
| 48 } | 48 } |
| 49 | 49 |
| 50 void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) { | 50 void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) { |
| 51 scoped_ptr<content::MediaStreamUI> ui; | 51 std::unique_ptr<content::MediaStreamUI> ui; |
| 52 MediaStreamDevices devices; | 52 MediaStreamDevices devices; |
| 53 if (!allowed) { | 53 if (!allowed) { |
| 54 callback_.Run(devices, content::MEDIA_DEVICE_PERMISSION_DENIED, | 54 callback_.Run(devices, content::MEDIA_DEVICE_PERMISSION_DENIED, |
| 55 std::move(ui)); | 55 std::move(ui)); |
| 56 return; | 56 return; |
| 57 } | 57 } |
| 58 | 58 |
| 59 if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) { | 59 if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) { |
| 60 const MediaStreamDevices& audio_devices = audio_test_devices_.empty()? | 60 const MediaStreamDevices& audio_devices = audio_test_devices_.empty()? |
| 61 MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() : | 61 MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() : |
| (...skipping 23 matching lines...) Expand all Loading... |
| 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 : 0) | |
| 90 (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ? | 90 (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ? |
| 91 AwPermissionRequest::VideoCapture : 0); | 91 AwPermissionRequest::VideoCapture : 0); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace android_webview | 94 } // namespace android_webview |
| OLD | NEW |