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