From 80f42a0955365d641d7ca6cb5e99d0a8252a543e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Tue, 7 Aug 2018 10:01:05 +0200 Subject: MediaCaptureDevicesDispatcher: Minor cleanup - Make private methods private. - Use DCHECK_CURRENTLY_ON instead of just DCHECK (better error message). - Use auto for iterators. - Remove duplicate queue.empty() checks. - Remove unused arguments for getDevicesForDesktopCapture. Change-Id: I929f5d5882a2c1924159f4e001fe477e69a5f1a1 Reviewed-by: Michal Klocek --- src/core/media_capture_devices_dispatcher.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/media_capture_devices_dispatcher.h') diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h index c24d23cc3..928d83165 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -73,6 +73,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, // Called back from our WebContentsAdapter to grant the requested permission. void handleMediaAccessPermissionResponse(content::WebContents *, const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags); + private: void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, content::MediaStreamDevices *); // Overridden from content::MediaObserver: @@ -94,7 +95,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, DesktopStreamsRegistry *getDesktopStreamsRegistry(); - private: friend struct base::DefaultSingletonTraits; struct PendingAccessRequest { -- cgit v1.2.3