From 9cfde2edf4736ae9533e7e1fac495a23ad905419 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 20 May 2019 14:17:47 +0200 Subject: Adaptations for Chromium 75 Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3 Reviewed-by: Peter Varga --- src/core/net/network_delegate_qt.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/net/network_delegate_qt.cpp') diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp index 20addefb2..68bf34d31 100644 --- a/src/core/net/network_delegate_qt.cpp +++ b/src/core/net/network_delegate_qt.cpp @@ -90,7 +90,7 @@ WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::Page static QWebEngineUrlRequestInfo::ResourceType toQt(content::ResourceType resourceType) { - if (resourceType >= 0 && resourceType < content::ResourceType(QWebEngineUrlRequestInfo::ResourceTypeLast)) + if (resourceType >= content::ResourceType::kMainFrame && resourceType <= content::ResourceType::kMaxValue) return static_cast(resourceType); return QWebEngineUrlRequestInfo::ResourceTypeUnknown; } @@ -111,7 +111,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, net::Complet Q_ASSERT(m_profileIOData); content::ResourceRequestInfo *resourceInfo = content::ResourceRequestInfo::ForRequest(request); - content::ResourceType resourceType = content::RESOURCE_TYPE_LAST_TYPE; + content::ResourceType resourceType = content::ResourceType::kMaxValue; WebContentsAdapterClient::NavigationType navigationType = WebContentsAdapterClient::OtherNavigation; if (resourceInfo) { @@ -122,7 +122,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, net::Complet const QUrl qUrl = toQt(request->url()); QUrl firstPartyUrl = QUrl(); - if (resourceType == content::ResourceType::RESOURCE_TYPE_SUB_FRAME) + if (resourceType == content::ResourceType::kSubFrame) firstPartyUrl = toQt(request->first_party_url()); else firstPartyUrl = toQt(request->site_for_cookies()); -- cgit v1.2.3