summaryrefslogtreecommitdiff
path: root/chromium/qtwebengine/browser/qt_webengine_resources.grd
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2020-10-29 10:01:00 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-16 15:21:53 +0100
commita0cbfced7f87d3845c4283fcb2a1a91c7d6e36f4 (patch)
tree80c0b642ee3602bb77ea94cb95a2ea45a76e4a23 /chromium/qtwebengine/browser/qt_webengine_resources.grd
parent922cf977666f21c3a2b3b6ffb6fb8f40e63cb651 (diff)
downloadqtwebengine-chromium-a0cbfced7f87d3845c4283fcb2a1a91c7d6e36f4.tar.gz
Add minimal webrtcdesktopcapture api for hangout services extension
The hangout services extension is required for meet.google.com. The extension is only able to capture the primary screen without audio with this fix. Change-Id: Ic5563ebe4e0b8f1e8bfa83ca0830f180281a1f8c Fixes: QTBUG-85731 Task-number: QTBUG-51185 Task-number: QTBUG-61676 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/qtwebengine/browser/qt_webengine_resources.grd')
-rw-r--r--chromium/qtwebengine/browser/qt_webengine_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/qtwebengine/browser/qt_webengine_resources.grd b/chromium/qtwebengine/browser/qt_webengine_resources.grd
index 8da8c851146..7936ec7a921 100644
--- a/chromium/qtwebengine/browser/qt_webengine_resources.grd
+++ b/chromium/qtwebengine/browser/qt_webengine_resources.grd
@@ -21,6 +21,9 @@
<include name="IDR_SANDBOX_INTERNALS_HTML" file="../../chrome/browser/resources/sandbox_internals/sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="../../chrome/browser/resources/sandbox_internals/sandbox_internals.js" type="BINDATA" compress="gzip" />
</if>
+ <if expr="enable_hangout_services_extension">
+ <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="../../chrome/browser/resources/hangout_services/manifest.json" type="BINDATA" />
+ </if>
</includes>
</release>
</grit>