diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-23 14:43:14 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-15 18:11:44 +0200 |
| commit | 027e7e574e7a4488d47cd4133e98d518210b1e56 (patch) | |
| tree | c45f05457509b7d99c39a3889119c04c4aee39e3 /src/core/content_browser_client_qt.h | |
| parent | 2dce0008ce53d27d281ad2dc00eb32d25ae5fc84 (diff) | |
Adaptations for Chromium 88
Change-Id: Ie66e95dbb9fbcafe961bb98d5c277f8c32d66b96
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
| -rw-r--r-- | src/core/content_browser_client_qt.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 8b891131f..a5fcc64ef 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -145,13 +145,7 @@ public: const GURL &first_party, const base::Optional<url::Origin> &top_frame_origin, content::BrowserContext *context) override; - content::AllowServiceWorkerResult AllowServiceWorkerOnIO( - const GURL &scope, - const GURL &site_for_cookies, - const base::Optional<url::Origin> &top_frame_origin, - const GURL &script_url, - content::ResourceContext *context) override; - content::AllowServiceWorkerResult AllowServiceWorkerOnUI( + content::AllowServiceWorkerResult AllowServiceWorker( const GURL &scope, const GURL &site_for_cookies, const base::Optional<url::Origin> &top_frame_origin, @@ -223,6 +217,7 @@ public: content::NavigationHandle *navigation_handle) override; bool IsHandledURL(const GURL &url) override; + bool HasErrorPage(int http_status_code, content::WebContents *contents) override; bool WillCreateURLLoaderFactory(content::BrowserContext *browser_context, content::RenderFrameHost *frame, @@ -230,7 +225,7 @@ public: URLLoaderFactoryType type, const url::Origin &request_initiator, base::Optional<int64_t> navigation_id, - base::UkmSourceId ukm_source_id, + ukm::SourceIdObj ukm_source_id, mojo::PendingReceiver<network::mojom::URLLoaderFactory> *factory_receiver, mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient> *header_client, bool *bypass_redirect_checks, @@ -246,11 +241,10 @@ public: network::mojom::CertVerifierCreationParams *cert_verifier_creation_params) override; std::vector<base::FilePath> GetNetworkContextsParentDirectory() override; - void RegisterNonNetworkNavigationURLLoaderFactories(int frame_tree_node_id, base::UkmSourceId ukm_source_id, - NonNetworkURLLoaderFactoryDeprecatedMap *uniquely_owned_factories, + void RegisterNonNetworkNavigationURLLoaderFactories(int frame_tree_node_id, + ukm::SourceIdObj ukm_source_id, NonNetworkURLLoaderFactoryMap *factories) override; void RegisterNonNetworkSubresourceURLLoaderFactories(int render_process_id, int render_frame_id, - NonNetworkURLLoaderFactoryDeprecatedMap *uniquely_owned_factories, NonNetworkURLLoaderFactoryMap *factories) override; void RegisterNonNetworkWorkerMainResourceURLLoaderFactories(content::BrowserContext* browser_context, NonNetworkURLLoaderFactoryMap* factories) override; |