diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-10-02 15:34:32 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-10-04 09:45:29 +0000 |
| commit | 5ff03f54121421ebe474e93f30ae669793bb44b7 (patch) | |
| tree | a19f0939a7002ce23a9beb1b083b9cd40c91c1b1 | |
| parent | 13aed800921e760e1cd9dba8c77f10fda849274a (diff) | |
Fix resolve_proxy service permissions
Task-number: QTBUG-69281
Change-Id: I6ff926a0036c1df840c35192da71363ac240ce57
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
3 files changed, 23 insertions, 0 deletions
diff --git a/chromium/qtwebengine/browser/BUILD.gn b/chromium/qtwebengine/browser/BUILD.gn index 122e55b089a..e7705509353 100644 --- a/chromium/qtwebengine/browser/BUILD.gn +++ b/chromium/qtwebengine/browser/BUILD.gn @@ -30,10 +30,15 @@ service_manifest("qtwebengine_content_packaged_services_manifest_overlay") { ] } +service_manifest("qtwebengine_content_browser_manifest_overlay") { + source = "//qtwebengine/browser/qtwebengine_content_browser_manifest_overlay.json" +} + group("qtwebengine_content_manifest_overlays") { deps = [ ":qtwebengine_content_packaged_services_manifest_overlay", ":qtwebengine_content_renderer_manifest_overlay", + ":qtwebengine_content_browser_manifest_overlay" ] } @@ -47,14 +52,21 @@ service_manifest("qtwebengine_content_renderer_manifest") { overlays = [ ":qtwebengine_content_renderer_manifest_overlay" ] } +service_manifest("qtwebengine_content_browser_manifest") { + source_manifest = "//content/public/app:browser_manifest" + overlays = [ ":qtwebengine_content_browser_manifest_overlay" ] +} + group("service_manifests") { deps = [ ":qtwebengine_content_renderer_manifest", + ":qtwebengine_content_browser_manifest" ] } qtwebengine_embedded_services = [ ":qtwebengine_content_renderer_manifest", + ":qtwebengine_content_browser_manifest" ] catalog("catalog") { diff --git a/chromium/qtwebengine/browser/qt_webengine_resources.grd b/chromium/qtwebengine/browser/qt_webengine_resources.grd index 6a264e9eeec..c77aca3f64a 100644 --- a/chromium/qtwebengine/browser/qt_webengine_resources.grd +++ b/chromium/qtwebengine/browser/qt_webengine_resources.grd @@ -19,6 +19,7 @@ <include name="IDR_SANDBOX_INTERNALS_JS" file="../../chrome/browser/resources/sandbox_internals/sandbox_internals.js" type="BINDATA" compress="gzip" /> </if> <include name="IDR_QTWEBENGINE_CONTENT_RENDERER_MANIFEST_OVERLAY" file="gen\qtwebengine\browser\qtwebengine_content_renderer_manifest_overlay.json" use_base_dir="false" type="BINDATA" /> + <include name="IDR_QTWEBENGINE_CONTENT_BROWSER_MANIFEST_OVERLAY" file="gen\qtwebengine\browser\qtwebengine_content_browser_manifest_overlay.json" use_base_dir="false" type="BINDATA" /> <include name="IDR_QTWEBENGINE_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY" use_base_dir="false" file="gen\qtwebengine\browser\qtwebengine_content_packaged_services_manifest_overlay.json" type="BINDATA" /> </includes> </release> diff --git a/chromium/qtwebengine/browser/qtwebengine_content_browser_manifest_overlay.json b/chromium/qtwebengine/browser/qtwebengine_content_browser_manifest_overlay.json new file mode 100644 index 00000000000..8e605a2b0fe --- /dev/null +++ b/chromium/qtwebengine/browser/qtwebengine_content_browser_manifest_overlay.json @@ -0,0 +1,10 @@ +{ + "name": "content_browser", + "interface_provider_specs": { + "service_manager:connector": { + "requires": { + "proxy_resolver": [ "factory" ] + } + } + } +} |