diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-10-28 15:59:18 +0100 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-01-20 09:41:11 +0100 |
commit | 2b6f6ad066123253b65449033eddcee8b20c470b (patch) | |
tree | d074840fb4b83394f3bb2694ec1c3f7cb725e4c9 /src/core/media_capture_devices_dispatcher.cpp | |
parent | 34dbb4967cb72717a50ef5cba4b84c06a9b160ef (diff) |
Enable hangout services extension
[ChangeLog] Enable hangout services extension and implement its
WebRTC desktop capture extension API dependency.
Fixes: QTBUG-85731
Task-number: QTBUG-51185
Task-number: QTBUG-61676
Change-Id: I7a659c2b0039243ac8d8c58685716ffc55265e3b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.cpp')
-rw-r--r-- | src/core/media_capture_devices_dispatcher.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp index 2c2c8cd47..ef5d65745 100644 --- a/src/core/media_capture_devices_dispatcher.cpp +++ b/src/core/media_capture_devices_dispatcher.cpp @@ -381,7 +381,7 @@ void MediaCaptureDevicesDispatcher::Observe(int type, const content::Notificatio } } -void MediaCaptureDevicesDispatcher::processMediaAccessRequest(WebContentsAdapterClient *adapterClient, content::WebContents *webContents, const content::MediaStreamRequest &request, content::MediaResponseCallback callback) +void MediaCaptureDevicesDispatcher::processMediaAccessRequest(content::WebContents *webContents, const content::MediaStreamRequest &request, content::MediaResponseCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -391,6 +391,9 @@ void MediaCaptureDevicesDispatcher::processMediaAccessRequest(WebContentsAdapter return; } + WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>(webContents->GetDelegate()); + WebContentsAdapterClient *adapterClient = delegate->adapterClient(); + if (flags.testFlag(WebContentsAdapterClient::MediaDesktopVideoCapture)) { const bool screenCaptureEnabled = adapterClient->webEngineSettings()->testAttribute(WebEngineSettings::ScreenCaptureEnabled); |