summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-23 12:53:51 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-04 10:19:54 +0200
commit19a0ec849dd48fbb0964b41f21c2c56e0944bce3 (patch)
treef9d66c78074e83214ac15f58904f3a36c4164df7
parent3c40c8bf1f2a3e8439fda03fc94a60402a45184e (diff)
downloadqtwebengine-chromium-19a0ec849dd48fbb0964b41f21c2c56e0944bce3.tar.gz
Allow us to set cookie_manager like android_webview
Change-Id: I83fad9f0fbd0f4227d73061af449d595b136636f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/services/network/network_context.cc2
-rw-r--r--chromium/services/network/public/mojom/network_context.mojom1
2 files changed, 1 insertions, 2 deletions
diff --git a/chromium/services/network/network_context.cc b/chromium/services/network/network_context.cc
index bf9fd334fa9..e5c3c3d5855 100644
--- a/chromium/services/network/network_context.cc
+++ b/chromium/services/network/network_context.cc
@@ -447,7 +447,7 @@ NetworkContext::NetworkContext(
SetSCTAuditingEnabled(params_->enable_sct_auditing);
#endif
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
if (params_->cookie_manager)
GetCookieManager(std::move(params_->cookie_manager));
#endif
diff --git a/chromium/services/network/public/mojom/network_context.mojom b/chromium/services/network/public/mojom/network_context.mojom
index ee72555cf4e..047a32e03fa 100644
--- a/chromium/services/network/public/mojom/network_context.mojom
+++ b/chromium/services/network/public/mojom/network_context.mojom
@@ -394,7 +394,6 @@ struct NetworkContextParams {
// Binds to the cookie manager associated with this network context, which
// should only be handed out to trusted processes.
- [EnableIf=is_android]
pending_receiver<CookieManager>? cookie_manager;
// Whether to enable Domain Reliability.