| 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/binding_set.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 mojo::shell::mojom::InterfaceProviderPtr exposed_services, | 34 mojo::shell::mojom::InterfaceProviderPtr exposed_services, |
| 35 mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection, | 35 mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection, |
| 36 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; | 36 const mojo::shell::mojom::Connector::ConnectCallback& callback) override; |
| 37 void Clone(mojo::shell::mojom::ConnectorRequest request) override; | 37 void Clone(mojo::shell::mojom::ConnectorRequest request) override; |
| 38 | 38 |
| 39 ServiceRegistryImpl* GetServiceRegistry(); | 39 ServiceRegistryImpl* GetServiceRegistry(); |
| 40 | 40 |
| 41 RenderFrameHost* frame_host_; | 41 RenderFrameHost* frame_host_; |
| 42 mojo::BindingSet<mojo::shell::mojom::Connector> connectors_; | 42 mojo::BindingSet<mojo::shell::mojom::Connector> connectors_; |
| 43 | 43 |
| 44 std::string mojo_user_id_; |
| 45 |
| 44 // ServiceRegistry providing browser services to connected applications. | 46 // ServiceRegistry providing browser services to connected applications. |
| 45 scoped_ptr<ServiceRegistryImpl> service_registry_; | 47 scoped_ptr<ServiceRegistryImpl> service_registry_; |
| 46 mojo::BindingSet<mojo::shell::mojom::InterfaceProvider> | 48 mojo::BindingSet<mojo::shell::mojom::InterfaceProvider> |
| 47 service_provider_bindings_; | 49 service_provider_bindings_; |
| 48 | 50 |
| 49 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); | 51 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); |
| 50 }; | 52 }; |
| 51 | 53 |
| 52 } // namespace content | 54 } // namespace content |
| 53 | 55 |
| 54 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ | 56 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
| OLD | NEW |