| 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/interface_request.h" | 11 #include "mojo/public/cpp/bindings/interface_request.h" |
| 11 #include "mojo/public/cpp/bindings/weak_binding_set.h" | |
| 12 #include "mojo/shell/public/interfaces/shell.mojom.h" | 12 #include "mojo/shell/public/interfaces/shell.mojom.h" |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 | 15 |
| 16 class RenderFrameHost; | 16 class RenderFrameHost; |
| 17 class ServiceRegistryImpl; | 17 class ServiceRegistryImpl; |
| 18 | 18 |
| 19 // This provides the |mojo::shell::mojom::Shell| service interface to each | 19 // This provides the |mojo::shell::mojom::Shell| service interface to each |
| 20 // frame's ServiceRegistry, giving frames the ability to connect to Mojo | 20 // frame's ServiceRegistry, giving frames the ability to connect to Mojo |
| 21 // applications. | 21 // applications. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 38 const mojo::String& application_url, | 38 const mojo::String& application_url, |
| 39 uint32_t user_id, | 39 uint32_t user_id, |
| 40 mojo::shell::mojom::InterfaceProviderRequest services, | 40 mojo::shell::mojom::InterfaceProviderRequest services, |
| 41 mojo::shell::mojom::InterfaceProviderPtr exposed_services, | 41 mojo::shell::mojom::InterfaceProviderPtr exposed_services, |
| 42 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; | 42 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; |
| 43 void Clone(mojo::shell::mojom::ConnectorRequest request) override; | 43 void Clone(mojo::shell::mojom::ConnectorRequest request) override; |
| 44 | 44 |
| 45 ServiceRegistryImpl* GetServiceRegistry(); | 45 ServiceRegistryImpl* GetServiceRegistry(); |
| 46 | 46 |
| 47 RenderFrameHost* frame_host_; | 47 RenderFrameHost* frame_host_; |
| 48 mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_; | 48 mojo::BindingSet<mojo::shell::mojom::Shell> bindings_; |
| 49 mojo::WeakBindingSet<mojo::shell::mojom::Connector> connectors_; | 49 mojo::BindingSet<mojo::shell::mojom::Connector> connectors_; |
| 50 | 50 |
| 51 // ServiceRegistry providing browser services to connected applications. | 51 // ServiceRegistry providing browser services to connected applications. |
| 52 scoped_ptr<ServiceRegistryImpl> service_registry_; | 52 scoped_ptr<ServiceRegistryImpl> service_registry_; |
| 53 mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider> | 53 mojo::BindingSet<mojo::shell::mojom::InterfaceProvider> |
| 54 service_provider_bindings_; | 54 service_provider_bindings_; |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); | 56 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace content | 59 } // namespace content |
| 60 | 60 |
| 61 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ | 61 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
| OLD | NEW |