| 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 3c209d2e752ab1f427be7a7508c11e94348a0817..715436b546cbd78c2b213b1348bc36b27c7469c3 100644
|
| --- a/content/browser/frame_host/frame_mojo_shell.h
|
| +++ b/content/browser/frame_host/frame_mojo_shell.h
|
| @@ -6,6 +6,7 @@
|
| #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "mojo/application/public/interfaces/shell.mojom.h"
|
| #include "mojo/common/weak_binding_set.h"
|
| #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
|
| @@ -13,6 +14,7 @@
|
| namespace content {
|
|
|
| class RenderFrameHost;
|
| +class ServiceRegistryImpl;
|
|
|
| // This provides the |mojo::Shell| service interface to each frame's
|
| // ServiceRegistry, giving frames the ability to connect to Mojo applications.
|
| @@ -31,9 +33,15 @@ class FrameMojoShell : public mojo::Shell {
|
| mojo::ServiceProviderPtr exposed_services) override;
|
| void QuitApplication() override;
|
|
|
| + ServiceRegistryImpl* GetServiceRegistry();
|
| +
|
| RenderFrameHost* frame_host_;
|
| mojo::WeakBindingSet<mojo::Shell> bindings_;
|
|
|
| + // ServiceRegistry providing browser services to connected applications.
|
| + scoped_ptr<ServiceRegistryImpl> service_registry_;
|
| + mojo::WeakBindingSet<mojo::ServiceProvider> service_provider_bindings_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
|
| };
|
|
|
|
|