OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "mojo/public/cpp/bindings/binding_set.h" | 10 #include "mojo/public/cpp/bindings/binding_set.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 ~FrameMojoShell() override; | 25 ~FrameMojoShell() override; |
26 | 26 |
27 void BindRequest(mojo::shell::mojom::ConnectorRequest request); | 27 void BindRequest(mojo::shell::mojom::ConnectorRequest request); |
28 | 28 |
29 private: | 29 private: |
30 // mojo::Connector: | 30 // mojo::Connector: |
31 void Connect( | 31 void Connect( |
32 mojo::shell::mojom::IdentityPtr target, | 32 mojo::shell::mojom::IdentityPtr target, |
33 mojo::shell::mojom::InterfaceProviderRequest services, | 33 mojo::shell::mojom::InterfaceProviderRequest services, |
34 mojo::shell::mojom::InterfaceProviderPtr exposed_services, | 34 mojo::shell::mojom::InterfaceProviderPtr exposed_services, |
| 35 mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection, |
35 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; | 36 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; |
36 void Clone(mojo::shell::mojom::ConnectorRequest request) override; | 37 void Clone(mojo::shell::mojom::ConnectorRequest request) override; |
37 | 38 |
38 ServiceRegistryImpl* GetServiceRegistry(); | 39 ServiceRegistryImpl* GetServiceRegistry(); |
39 | 40 |
40 RenderFrameHost* frame_host_; | 41 RenderFrameHost* frame_host_; |
41 mojo::BindingSet<mojo::shell::mojom::Connector> connectors_; | 42 mojo::BindingSet<mojo::shell::mojom::Connector> connectors_; |
42 | 43 |
43 // ServiceRegistry providing browser services to connected applications. | 44 // ServiceRegistry providing browser services to connected applications. |
44 scoped_ptr<ServiceRegistryImpl> service_registry_; | 45 scoped_ptr<ServiceRegistryImpl> service_registry_; |
45 mojo::BindingSet<mojo::shell::mojom::InterfaceProvider> | 46 mojo::BindingSet<mojo::shell::mojom::InterfaceProvider> |
46 service_provider_bindings_; | 47 service_provider_bindings_; |
47 | 48 |
48 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); | 49 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); |
49 }; | 50 }; |
50 | 51 |
51 } // namespace content | 52 } // namespace content |
52 | 53 |
53 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ | 54 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
OLD | NEW |