From d5bffb5125da23718e8098441b4a4269a5cf2f33 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 30 Jan 2018 17:23:41 +0100 Subject: Basic adaptations for 64-based MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229 Reviewed-by: Michael Brüning --- src/core/content_browser_client_qt.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core/content_browser_client_qt.h') diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 094ad6549..86bd2977c 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -118,10 +118,8 @@ public: void BindInterfaceRequestFromFrame(content::RenderFrameHost* render_frame_host, const std::string& interface_name, mojo::ScopedMessagePipeHandle interface_pipe) override; - void ExposeInterfacesToRenderer(service_manager::BinderRegistry *registry, - content::AssociatedInterfaceRegistry *associated_registry, - content::RenderProcessHost *render_process_host) override; - + void RegisterInProcessServices(StaticServiceMap* services) override; + std::unique_ptr GetServiceManifestOverlay(base::StringPiece name) override; bool CanCreateWindow( content::RenderFrameHost* opener, const GURL& opener_url, @@ -146,7 +144,7 @@ public: bool AllowSetCookie(const GURL& url, const GURL& first_party, - const std::string& cookie_line, + const net::CanonicalCookie& cookie, content::ResourceContext* context, int render_process_id, int render_frame_id, -- cgit v1.2.3