diff options
Diffstat (limited to 'chromium/content/browser/renderer_host')
| -rw-r--r-- | chromium/content/browser/renderer_host/media/media_stream_manager.cc | 16 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/media/media_stream_manager.h | 16 |
2 files changed, 17 insertions, 15 deletions
diff --git a/chromium/content/browser/renderer_host/media/media_stream_manager.cc b/chromium/content/browser/renderer_host/media/media_stream_manager.cc index 0c6e5ca35e0..2acd0640ad7 100644 --- a/chromium/content/browser/renderer_host/media/media_stream_manager.cc +++ b/chromium/content/browser/renderer_host/media/media_stream_manager.cc @@ -675,9 +675,9 @@ class MediaStreamManager::DeviceRequest { std::string tab_capture_device_id; - int audio_subscription_id = PermissionControllerImpl::kNoPendingOperation; + PermissionController::SubscriptionId audio_subscription_id; - int video_subscription_id = PermissionControllerImpl::kNoPendingOperation; + PermissionController::SubscriptionId video_subscription_id; private: std::vector<MediaRequestState> state_; @@ -2740,8 +2740,8 @@ void MediaStreamManager::SubscribeToPermissionControllerOnUIThread( if (!controller) return; - int audio_subscription_id = PermissionControllerImpl::kNoPendingOperation; - int video_subscription_id = PermissionControllerImpl::kNoPendingOperation; + PermissionController::SubscriptionId audio_subscription_id; + PermissionController::SubscriptionId video_subscription_id; if (is_audio_request) { // It is safe to bind base::Unretained(this) because MediaStreamManager is @@ -2783,8 +2783,8 @@ void MediaStreamManager::SetPermissionSubscriptionIDs( const std::string& label, int requesting_process_id, int requesting_frame_id, - int audio_subscription_id, - int video_subscription_id) { + PermissionController::SubscriptionId audio_subscription_id, + PermissionController::SubscriptionId video_subscription_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DeviceRequest* const request = FindRequest(label); @@ -2811,8 +2811,8 @@ void MediaStreamManager::SetPermissionSubscriptionIDs( void MediaStreamManager::UnsubscribeFromPermissionControllerOnUIThread( int requesting_process_id, int requesting_frame_id, - int audio_subscription_id, - int video_subscription_id) { + PermissionController::SubscriptionId audio_subscription_id, + PermissionController::SubscriptionId video_subscription_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); PermissionControllerImpl* controller = diff --git a/chromium/content/browser/renderer_host/media/media_stream_manager.h b/chromium/content/browser/renderer_host/media/media_stream_manager.h index d6652e4a81a..44901cb3670 100644 --- a/chromium/content/browser/renderer_host/media/media_stream_manager.h +++ b/chromium/content/browser/renderer_host/media/media_stream_manager.h @@ -50,6 +50,7 @@ #include "content/public/browser/desktop_media_id.h" #include "content/public/browser/media_request_state.h" #include "content/public/browser/media_stream_request.h" +#include "content/public/browser/permission_controller.h" #include "media/base/video_facing.h" #include "third_party/blink/public/common/mediastream/media_devices.h" #include "third_party/blink/public/common/mediastream/media_stream_controls.h" @@ -567,19 +568,20 @@ class CONTENT_EXPORT MediaStreamManager // Store the subscription ids on a DeviceRequest in order to allow // unsubscribing when the request is deleted. - void SetPermissionSubscriptionIDs(const std::string& label, - int requesting_process_id, - int requesting_frame_id, - int audio_subscription_id, - int video_subscription_id); + void SetPermissionSubscriptionIDs( + const std::string& label, + int requesting_process_id, + int requesting_frame_id, + PermissionController::SubscriptionId audio_subscription_id, + PermissionController::SubscriptionId video_subscription_id); // Unsubscribe from following permission updates for the two specified // subscription IDs. Called when a request is deleted. static void UnsubscribeFromPermissionControllerOnUIThread( int requesting_process_id, int requesting_frame_id, - int audio_subscription_id, - int video_subscription_id); + PermissionController::SubscriptionId audio_subscription_id, + PermissionController::SubscriptionId video_subscription_id); // Callback that the PermissionController calls when a permission is updated. void PermissionChangedCallback(int requesting_process_id, |