diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-03-22 17:09:51 +0100 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-03-22 17:13:00 +0100 |
| commit | 51b887576cdfc5ababb368a62a9f96df47e9ce1c (patch) | |
| tree | ca39ba8ee1ee9a14582e0da911ade6208133f438 /src/core/network_delegate_qt.h | |
| parent | 23f7e8bb628c60a5f62764e7f3f87f8799be7959 (diff) | |
| parent | 7794aadf9076774296c38743e3be69dd6143d0da (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8aff2a3d2d4ae9351dc65689a4db9d3ab0d017b3
Diffstat (limited to 'src/core/network_delegate_qt.h')
| -rw-r--r-- | src/core/network_delegate_qt.h | 8 |
1 files changed, 4 insertions, 4 deletions
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<net::HttpResponseHeaders>*, 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; }; |