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/application/public/interfaces/shell.mojom.h" | 10 #include "mojo/application/public/interfaces/shell.mojom.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 ~FrameMojoShell() override; | 24 ~FrameMojoShell() override; |
25 | 25 |
26 void BindRequest(mojo::InterfaceRequest<mojo::Shell> shell_request); | 26 void BindRequest(mojo::InterfaceRequest<mojo::Shell> shell_request); |
27 | 27 |
28 private: | 28 private: |
29 // mojo::Shell: | 29 // mojo::Shell: |
30 void ConnectToApplication( | 30 void ConnectToApplication( |
31 mojo::URLRequestPtr application_url, | 31 mojo::URLRequestPtr application_url, |
32 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 32 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
33 mojo::ServiceProviderPtr exposed_services, | 33 mojo::ServiceProviderPtr exposed_services, |
34 mojo::CapabilityFilterPtr filter) override; | 34 mojo::CapabilityFilterPtr filter, |
| 35 const ConnectToApplicationCallback& callback) override; |
35 void QuitApplication() override; | 36 void QuitApplication() override; |
36 | 37 |
37 ServiceRegistryImpl* GetServiceRegistry(); | 38 ServiceRegistryImpl* GetServiceRegistry(); |
38 | 39 |
39 RenderFrameHost* frame_host_; | 40 RenderFrameHost* frame_host_; |
40 mojo::WeakBindingSet<mojo::Shell> bindings_; | 41 mojo::WeakBindingSet<mojo::Shell> bindings_; |
41 | 42 |
42 // ServiceRegistry providing browser services to connected applications. | 43 // ServiceRegistry providing browser services to connected applications. |
43 scoped_ptr<ServiceRegistryImpl> service_registry_; | 44 scoped_ptr<ServiceRegistryImpl> service_registry_; |
44 mojo::WeakBindingSet<mojo::ServiceProvider> service_provider_bindings_; | 45 mojo::WeakBindingSet<mojo::ServiceProvider> service_provider_bindings_; |
45 | 46 |
46 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); | 47 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); |
47 }; | 48 }; |
48 | 49 |
49 } // namespace content | 50 } // namespace content |
50 | 51 |
51 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ | 52 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
OLD | NEW |