summaryrefslogtreecommitdiffstats
path: root/src/core/content_browser_client_qt.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-27 17:56:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-22 08:47:36 +0000
commit5d0fbf8a6890c395c0cdc0c60e775b70c95e15ed (patch)
treec6354b09515a9110c121e3a3f3e97dd94b9b788a /src/core/content_browser_client_qt.h
parent43b7af20c421e4ffb20cd4625f3b704e78e7325d (diff)
General adaptations for Chromium 69
Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r--src/core/content_browser_client_qt.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 1da7ce26c..330024831 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -147,8 +147,7 @@ public:
const net::CanonicalCookie& cookie,
content::ResourceContext* context,
int render_process_id,
- int render_frame_id,
- const net::CookieOptions& options) override;
+ int render_frame_id) override;
bool AllowAppCache(const GURL& manifest_url,
const GURL& first_party,
@@ -170,7 +169,6 @@ public:
const std::vector<std::pair<int, int> > &render_frames) override;
std::unique_ptr<device::LocationProvider> OverrideSystemLocationProvider() override;
- void GetGeolocationRequestContext(base::OnceCallback<void(scoped_refptr<net::URLRequestContextGetter>)> callback) override;
#if defined(Q_OS_LINUX)
void GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override;
#endif
@@ -182,8 +180,10 @@ public:
scoped_refptr<content::LoginDelegate> CreateLoginDelegate(
net::AuthChallengeInfo *auth_info,
content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+ const content::GlobalRequestID &request_id,
bool is_main_frame,
const GURL &url,
+ scoped_refptr<net::HttpResponseHeaders> response_headers,
bool first_auth_attempt,
LoginAuthRequiredCallback auth_required_callback) override;
bool HandleExternalProtocol(