diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-30 17:23:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:17 +0000 |
| commit | d5bffb5125da23718e8098441b4a4269a5cf2f33 (patch) | |
| tree | 48a39ba7f833116cba7dcc7917d13d34a062949c /src/core/content_browser_client_qt.h | |
| parent | 789f375411b542db3ac3be79cbe0a6153720abf1 (diff) | |
Basic adaptations for 64-based
Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229
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.h | 8 |
1 files changed, 3 insertions, 5 deletions
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<base::Value> 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, |