diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-28 10:13:57 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-02 18:09:04 +0000 |
| commit | f89ded9f17a59ca1ffe4d8711c0af4d54489e105 (patch) | |
| tree | 113337ceb078215fc02850a8a5d8fc876e6fada8 /src/core/net/network_delegate_qt.h | |
| parent | 1fae7d725a5f51a1def0be614d503686664f2128 (diff) | |
Update Chromiumv5.12.0-beta1
Changes:
8e6f5751e5 Restore media::FFmpegGlue::InitializeFFmpeg()
0c8d188f16 Add x86 target support for gn
2a52817b6e Fix creation of 'x86' toolchain in gn
3a84c2a8bc Add support for modules limiting jumbo width
c69fdae9c7 BASELINE: Update Chromium to 69.0.3497.113
3a783ba38b Merge remote-tracking branch 'origin/upstream-master' into 69-based
a4ecaddc7c Remove missing symlink to gen from perfetto/ui/src
3f8994c671 [Backport] Use newer GrGLFunction based on templated function types rather than pointers.
Change-Id: Ibfe810c1c9b88e25e9093fbb2aa213249f1a77bf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/net/network_delegate_qt.h')
| -rw-r--r-- | src/core/net/network_delegate_qt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/net/network_delegate_qt.h b/src/core/net/network_delegate_qt.h index ac89b1284..e4ff196aa 100644 --- a/src/core/net/network_delegate_qt.h +++ b/src/core/net/network_delegate_qt.h @@ -62,7 +62,7 @@ public: // net::NetworkDelegate implementation int OnBeforeURLRequest(net::URLRequest* request, net::CompletionOnceCallback callback, GURL* new_url) override; void OnURLRequestDestroyed(net::URLRequest* request) override; - bool OnCanSetCookie(const net::URLRequest& request, const net::CanonicalCookie& cookie, net::CookieOptions* options, bool allowed_from_caller) override; + bool OnCanSetCookie(const net::URLRequest& request, const net::CanonicalCookie& cookie, net::CookieOptions* options) override; int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionOnceCallback callback, net::HttpRequestHeaders *headers) override; void OnBeforeSendHeaders(net::URLRequest* request, const net::ProxyInfo& proxy_info, const net::ProxyRetryInfoMap& proxy_retry_info, net::HttpRequestHeaders* headers) override; @@ -75,7 +75,7 @@ public: void OnCompleted(net::URLRequest *request, bool started, int net_error) override; void OnPACScriptError(int, const base::string16&) override; net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, AuthCallback, net::AuthCredentials*) override; - bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&, bool allowed_from_caller) override; + bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override; bool OnCanAccessFile(const net::URLRequest&, const base::FilePath&, const base::FilePath&) const override; bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override; bool OnAreExperimentalCookieFeaturesEnabled() const override; |