diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-21 16:01:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-07 17:08:45 +0000 |
| commit | 93ca852dbf00e93c07269e8cca389bc1222130d3 (patch) | |
| tree | 62b541249b8908d717f877c9adb811930bd78a24 /src/core/network_delegate_qt.cpp | |
| parent | a24df8f8e4ef0f99dbf5a6b09451bb39becaf66a (diff) | |
Basic adaptation to Chromium 49
Converts types, callbacks and headers to match Chromium 49.
Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/network_delegate_qt.cpp')
| -rw-r--r-- | src/core/network_delegate_qt.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp index 427e24332..cb2a9dc58 100644 --- a/src/core/network_delegate_qt.cpp +++ b/src/core/network_delegate_qt.cpp @@ -60,7 +60,7 @@ namespace QtWebEngineCore { int pageTransitionToNavigationType(ui::PageTransition transition) { - int32 qualifier = ui::PageTransitionGetQualifier(transition); + int32_t qualifier = ui::PageTransitionGetQualifier(transition); if (qualifier & ui::PAGE_TRANSITION_FORWARD_BACK) return WebContentsAdapterClient::BackForwardNavigation; @@ -264,15 +264,11 @@ void NetworkDelegateQt::OnResponseStarted(net::URLRequest*) { } -void NetworkDelegateQt::OnNetworkBytesReceived(const net::URLRequest&, int64_t) +void NetworkDelegateQt::OnNetworkBytesReceived(net::URLRequest*, int64_t) { } -void NetworkDelegateQt::OnNetworkBytesSent(const net::URLRequest&, int64_t) -{ -} - -void NetworkDelegateQt::OnURLRequestJobOrphaned(net::URLRequest*) +void NetworkDelegateQt::OnNetworkBytesSent(net::URLRequest*, int64_t) { } @@ -304,7 +300,12 @@ bool NetworkDelegateQt::OnCanEnablePrivacyMode(const GURL&, const GURL&) const return false; } -bool NetworkDelegateQt::OnFirstPartyOnlyCookieExperimentEnabled() const +bool NetworkDelegateQt::OnAreExperimentalCookieFeaturesEnabled() const +{ + return false; +} + +bool NetworkDelegateQt::OnAreStrictSecureCookiesEnabled() const { return false; } |