| Index: content/browser/frame_host/frame_mojo_shell.h
|
| diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
|
| index fa8f6d8931d9cc1883604af84d43cc440e097800..88709067a7b79f96e1594b750c2c90f6de83f07c 100644
|
| --- a/content/browser/frame_host/frame_mojo_shell.h
|
| +++ b/content/browser/frame_host/frame_mojo_shell.h
|
| @@ -19,7 +19,8 @@ class ServiceRegistryImpl;
|
| // This provides the |mojo::shell::mojom::Shell| service interface to each
|
| // frame's ServiceRegistry, giving frames the ability to connect to Mojo
|
| // applications.
|
| -class FrameMojoShell : public mojo::shell::mojom::Shell {
|
| +class FrameMojoShell : public mojo::shell::mojom::Shell,
|
| + public mojo::shell::mojom::Connector {
|
| public:
|
| explicit FrameMojoShell(RenderFrameHost* frame_host);
|
| ~FrameMojoShell() override;
|
| @@ -29,19 +30,24 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
|
|
|
| private:
|
| // mojo::Shell:
|
| + void GetConnector(mojo::shell::mojom::ConnectorRequest request) override;
|
| + void QuitApplication() override;
|
| +
|
| + // mojo::Connector:
|
| void Connect(
|
| const mojo::String& application_url,
|
| uint32_t user_id,
|
| mojo::shell::mojom::InterfaceProviderRequest services,
|
| mojo::shell::mojom::InterfaceProviderPtr exposed_services,
|
| mojo::shell::mojom::CapabilityFilterPtr filter,
|
| - const ConnectCallback& callback) override;
|
| - void QuitApplication() override;
|
| + const mojo::shell::mojom::Connector::ConnectCallback& callback) override;
|
| + void Clone(mojo::shell::mojom::ConnectorRequest request) override;
|
|
|
| ServiceRegistryImpl* GetServiceRegistry();
|
|
|
| RenderFrameHost* frame_host_;
|
| mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_;
|
| + mojo::WeakBindingSet<mojo::shell::mojom::Connector> connectors_;
|
|
|
| // ServiceRegistry providing browser services to connected applications.
|
| scoped_ptr<ServiceRegistryImpl> service_registry_;
|
|
|