From 93ca852dbf00e93c07269e8cca389bc1222130d3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 21 Jan 2016 16:01:46 +0100 Subject: Basic adaptation to Chromium 49 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael Brüning --- src/core/network_delegate_qt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/network_delegate_qt.h') diff --git a/src/core/network_delegate_qt.h b/src/core/network_delegate_qt.h index 4dc6ad28e..1324e0da3 100644 --- a/src/core/network_delegate_qt.h +++ b/src/core/network_delegate_qt.h @@ -84,16 +84,16 @@ public: virtual int OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr*, GURL*) override; virtual void OnBeforeRedirect(net::URLRequest*, const GURL&) override; virtual void OnResponseStarted(net::URLRequest*) override; - virtual void OnNetworkBytesReceived(const net::URLRequest&, int64_t) override; - virtual void OnNetworkBytesSent(const net::URLRequest&, int64_t) override; - virtual void OnURLRequestJobOrphaned(net::URLRequest*) override; + virtual void OnNetworkBytesReceived(net::URLRequest*, int64_t) override; + virtual void OnNetworkBytesSent(net::URLRequest *, int64_t) override; virtual void OnCompleted(net::URLRequest*, bool) override; virtual void OnPACScriptError(int, const base::string16&) override; virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*) override; virtual bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override; virtual bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const override; virtual bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override; - virtual bool OnFirstPartyOnlyCookieExperimentEnabled() const override; + virtual bool OnAreExperimentalCookieFeaturesEnabled() const override; + virtual bool OnAreStrictSecureCookiesEnabled() const override; virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override; }; -- cgit v1.2.3