| Index: android_webview/browser/permission/media_access_permission_request.cc
|
| diff --git a/android_webview/native/permission/media_access_permission_request.cc b/android_webview/browser/permission/media_access_permission_request.cc
|
| similarity index 67%
|
| rename from android_webview/native/permission/media_access_permission_request.cc
|
| rename to android_webview/browser/permission/media_access_permission_request.cc
|
| index ac88a920c4bc5c7bf3dd286833e7f235ea9fbd5f..b4d73e09621cfc9b69ecfda767d399e22f1e02fb 100644
|
| --- a/android_webview/native/permission/media_access_permission_request.cc
|
| +++ b/android_webview/browser/permission/media_access_permission_request.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/permission/media_access_permission_request.h"
|
| +#include "android_webview/browser/permission/media_access_permission_request.h"
|
|
|
| #include <utility>
|
|
|
| -#include "android_webview/native/permission/aw_permission_request.h"
|
| +#include "android_webview/browser/permission/aw_permission_request.h"
|
| #include "content/public/browser/media_capture_devices.h"
|
|
|
| using content::MediaCaptureDevices;
|
| @@ -40,12 +40,9 @@ const MediaStreamDevice* GetDeviceByIdOrFirstAvailable(
|
| MediaAccessPermissionRequest::MediaAccessPermissionRequest(
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback)
|
| - : request_(request),
|
| - callback_(callback) {
|
| -}
|
| + : request_(request), callback_(callback) {}
|
|
|
| -MediaAccessPermissionRequest::~MediaAccessPermissionRequest() {
|
| -}
|
| +MediaAccessPermissionRequest::~MediaAccessPermissionRequest() {}
|
|
|
| void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) {
|
| std::unique_ptr<content::MediaStreamUI> ui;
|
| @@ -57,9 +54,10 @@ void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) {
|
| }
|
|
|
| if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
|
| - const MediaStreamDevices& audio_devices = audio_test_devices_.empty()?
|
| - MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices() :
|
| - audio_test_devices_;
|
| + const MediaStreamDevices& audio_devices =
|
| + audio_test_devices_.empty()
|
| + ? MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices()
|
| + : audio_test_devices_;
|
| const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable(
|
| audio_devices, request_.requested_audio_device_id);
|
| if (device)
|
| @@ -67,16 +65,18 @@ void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) {
|
| }
|
|
|
| if (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
|
| - const MediaStreamDevices& video_devices = video_test_devices_.empty()?
|
| - MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices() :
|
| - video_test_devices_;
|
| + const MediaStreamDevices& video_devices =
|
| + video_test_devices_.empty()
|
| + ? MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices()
|
| + : video_test_devices_;
|
| const MediaStreamDevice* device = GetDeviceByIdOrFirstAvailable(
|
| video_devices, request_.requested_video_device_id);
|
| if (device)
|
| devices.push_back(*device);
|
| }
|
| - callback_.Run(devices, devices.empty() ? content::MEDIA_DEVICE_NO_HARDWARE
|
| - : content::MEDIA_DEVICE_OK,
|
| + callback_.Run(devices,
|
| + devices.empty() ? content::MEDIA_DEVICE_NO_HARDWARE
|
| + : content::MEDIA_DEVICE_OK,
|
| std::move(ui));
|
| }
|
|
|
| @@ -85,10 +85,12 @@ const GURL& MediaAccessPermissionRequest::GetOrigin() {
|
| }
|
|
|
| int64_t MediaAccessPermissionRequest::GetResources() {
|
| - return (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE ?
|
| - AwPermissionRequest::AudioCapture : 0) |
|
| - (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ?
|
| - AwPermissionRequest::VideoCapture : 0);
|
| + return (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE
|
| + ? AwPermissionRequest::AudioCapture
|
| + : 0) |
|
| + (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE
|
| + ? AwPermissionRequest::VideoCapture
|
| + : 0);
|
| }
|
|
|
| } // namespace android_webview
|
|
|