diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-16 18:34:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-04 11:20:50 +0200 |
commit | fae023b184f6c044e85f4ca6052c306d519e2e85 (patch) | |
tree | 0c470f156e41fbe5d47782f34a3a8afc17ee3147 /src/core/content_browser_client_qt.h | |
parent | 38a6d268b09c49878b3a9b4819771f5c74925c35 (diff) |
Adaptations for Chromium 100
Pick-to: 6.4
Change-Id: I217c87657f544a2e868de7291353ff1143e20902
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r-- | src/core/content_browser_client_qt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 220ab43f9..c55c4f044 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -80,9 +80,8 @@ public: void ExposeInterfacesToRenderer(service_manager::BinderRegistry *registry, blink::AssociatedInterfaceRegistry *associated_registry, content::RenderProcessHost *render_process_host) override; - bool BindAssociatedReceiverFromFrame(content::RenderFrameHost *render_frame_host, - const std::string &interface_name, - mojo::ScopedInterfaceEndpointHandle *handle) override; + void RegisterAssociatedInterfaceBindersForRenderFrameHost(content::RenderFrameHost &render_frame_host, + blink::AssociatedInterfaceRegistry &associated_registry) override; bool CanCreateWindow(content::RenderFrameHost *opener, const GURL &opener_url, @@ -178,8 +177,8 @@ public: ui::PageTransition page_transition, bool has_user_gesture, const absl::optional<url::Origin> &initiating_origin, + content::RenderFrameHost *initiator_document, mojo::PendingRemote<network::mojom::URLLoaderFactory> *out_factory) override; - std::vector<std::unique_ptr<blink::URLLoaderThrottle>> CreateURLLoaderThrottles( const network::ResourceRequest &request, content::BrowserContext *browser_context, const base::RepeatingCallback<content::WebContents *()> &wc_getter, @@ -219,6 +218,7 @@ public: ukm::SourceIdObj ukm_source_id, NonNetworkURLLoaderFactoryMap *factories) override; void RegisterNonNetworkSubresourceURLLoaderFactories(int render_process_id, int render_frame_id, + const absl::optional<url::Origin>& request_initiator_origin, NonNetworkURLLoaderFactoryMap *factories) override; void RegisterNonNetworkWorkerMainResourceURLLoaderFactories(content::BrowserContext* browser_context, NonNetworkURLLoaderFactoryMap* factories) override; |