diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-27 17:56:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:36 +0000 |
| commit | 5d0fbf8a6890c395c0cdc0c60e775b70c95e15ed (patch) | |
| tree | c6354b09515a9110c121e3a3f3e97dd94b9b788a /src/core/media_capture_devices_dispatcher.h | |
| parent | 43b7af20c421e4ffb20cd4625f3b704e78e7325d (diff) | |
General adaptations for Chromium 69
Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.h')
| -rw-r--r-- | src/core/media_capture_devices_dispatcher.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h index 928d83165..2aff0b28e 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -48,6 +48,7 @@ #include "web_contents_adapter_client.h" #include "base/callback.h" +#include "base/containers/circular_deque.h" #include "base/memory/singleton.h" #include "base/observer_list.h" #include "content/public/browser/media_observer.h" @@ -68,7 +69,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, static MediaCaptureDevicesDispatcher *GetInstance(); - void processMediaAccessRequest(WebContentsAdapterClient *, content::WebContents *, const content::MediaStreamRequest &, const content::MediaResponseCallback &); + void processMediaAccessRequest(WebContentsAdapterClient *, content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); // Called back from our WebContentsAdapter to grant the requested permission. void handleMediaAccessPermissionResponse(content::WebContents *, const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags); @@ -97,15 +98,18 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; + typedef base::RepeatingCallback<void(const content::MediaStreamDevices& devices, + content::MediaStreamRequestResult result, + std::unique_ptr<content::MediaStreamUI> ui)> RepeatingMediaResponseCallback; + struct PendingAccessRequest { - PendingAccessRequest(const content::MediaStreamRequest &request, - const content::MediaResponseCallback &callback); + PendingAccessRequest(const content::MediaStreamRequest &request, const RepeatingMediaResponseCallback &callback); ~PendingAccessRequest(); content::MediaStreamRequest request; - content::MediaResponseCallback callback; + RepeatingMediaResponseCallback callback; }; - typedef std::deque<PendingAccessRequest> RequestsQueue; + typedef base::circular_deque<PendingAccessRequest> RequestsQueue; typedef std::map<content::WebContents *, RequestsQueue> RequestsQueues; MediaCaptureDevicesDispatcher(); @@ -115,8 +119,8 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) override; // Helpers for ProcessMediaAccessRequest(). - void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, const content::MediaResponseCallback &); - void enqueueMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, const content::MediaResponseCallback &); + void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); + void enqueueMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); void ProcessQueuedAccessRequest(content::WebContents *); // Called by the MediaObserver() functions, executed on UI thread. |