diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-08-07 10:01:05 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-08-10 06:52:27 +0000 |
| commit | 80f42a0955365d641d7ca6cb5e99d0a8252a543e (patch) | |
| tree | ba1d7a6fd65cc7f24e5f5bd56564feb05020b6c9 /src/core/media_capture_devices_dispatcher.h | |
| parent | 24a81ed670ec5c015b258a7e3960156720b356be (diff) | |
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 <michal.klocek@qt.io>
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.h')
| -rw-r--r-- | src/core/media_capture_devices_dispatcher.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<MediaCaptureDevicesDispatcher>; struct PendingAccessRequest { |