diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-19 11:42:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 17:06:43 +0200 |
| commit | 34cd9bb6006b854ef8029448be10822b14a2b7ac (patch) | |
| tree | 2d04302f7d5c71b13ef73fc419937047b3a0f218 /src/core/content_browser_client_qt.cpp | |
| parent | 404201b9a41564512937a7d96e55d6b095bdcab0 (diff) | |
| parent | 6fffee8bfb270eda4f06fa5dbe3a4b190036e90a (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
configure.json
src/3rdparty
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
src/core/login_delegate_qt.cpp
src/core/login_delegate_qt.h
src/core/net/url_request_context_getter_qt.cpp
src/core/net/url_request_context_getter_qt.h
src/core/qtwebengine.gni
3rdparty changes:
616a7f558c7e This is expected for us, so don't report it as an error.
c30febceaa1b Do not write <protocol>.json to source directory
9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's
e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error.
f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts
f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used
5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium
34f52ec3bae8 Bump maximum number of custom isolated world ids
f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check
1e80090f7044 Fix resolve_proxy service permissions
2e498629651d Add proxy_resolver_manifest
Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 03f5a10fb..0b92016f1 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -42,6 +42,7 @@ #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #if QT_CONFIG(webengine_spellchecker) #include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h" @@ -75,6 +76,7 @@ #include "services/device/public/cpp/geolocation/location_provider.h" #include "services/resource_coordinator/public/cpp/process_resource_coordinator.h" #include "services/resource_coordinator/public/cpp/resource_coordinator_features.h" +#include "services/proxy_resolver/proxy_resolver_service.h" #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/service.h" #include "services/service_manager/sandbox/switches.h" @@ -702,6 +704,12 @@ void ContentBrowserClientQt::RegisterInProcessServices(StaticServiceMap* service services->insert(std::make_pair("qtwebengine", info)); } +void ContentBrowserClientQt::RegisterOutOfProcessServices(content::ContentBrowserClient::OutOfProcessServiceMap *services) +{ + (*services)[proxy_resolver::mojom::kProxyResolverServiceName] = + base::BindRepeating(&base::ASCIIToUTF16, "V8 Proxy Resolver"); +} + std::unique_ptr<base::Value> ContentBrowserClientQt::GetServiceManifestOverlay(base::StringPiece name) { ui::ResourceBundle &rb = ui::ResourceBundle::GetSharedInstance(); @@ -710,6 +718,8 @@ std::unique_ptr<base::Value> ContentBrowserClientQt::GetServiceManifestOverlay(b id = IDR_QTWEBENGINE_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY; else if (name == content::mojom::kRendererServiceName) id = IDR_QTWEBENGINE_CONTENT_RENDERER_MANIFEST_OVERLAY; + else if (name == content::mojom::kBrowserServiceName) + id = IDR_QTWEBENGINE_CONTENT_BROWSER_MANIFEST_OVERLAY; if (id == -1) return nullptr; |