OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_ | 5 #ifndef MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_ |
6 #define MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_ | 6 #define MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "mojo/public/cpp/bindings/binding_set.h" | 10 #include "mojo/public/cpp/bindings/binding_set.h" |
| 11 #include "services/service_manager/public/cpp/binder_registry.h" |
11 #include "services/service_manager/public/cpp/interface_factory.h" | 12 #include "services/service_manager/public/cpp/interface_factory.h" |
12 #include "services/service_manager/public/cpp/service.h" | 13 #include "services/service_manager/public/cpp/service.h" |
13 #include "services/service_manager/public/interfaces/service_factory.mojom.h" | 14 #include "services/service_manager/public/interfaces/service_factory.mojom.h" |
14 | 15 |
15 namespace service_manager { | 16 namespace service_manager { |
16 class ServiceContext; | 17 class ServiceContext; |
17 } | 18 } |
18 | 19 |
19 namespace mash { | 20 namespace mash { |
20 | 21 |
(...skipping 13 matching lines...) Expand all Loading... |
34 // - Add an entry for the new service in MashPackagedService::CreateService(). | 35 // - Add an entry for the new service in MashPackagedService::CreateService(). |
35 class MashPackagedService : public service_manager::Service, | 36 class MashPackagedService : public service_manager::Service, |
36 public service_manager::mojom::ServiceFactory, | 37 public service_manager::mojom::ServiceFactory, |
37 public service_manager::InterfaceFactory< | 38 public service_manager::InterfaceFactory< |
38 service_manager::mojom::ServiceFactory> { | 39 service_manager::mojom::ServiceFactory> { |
39 public: | 40 public: |
40 MashPackagedService(); | 41 MashPackagedService(); |
41 ~MashPackagedService() override; | 42 ~MashPackagedService() override; |
42 | 43 |
43 // service_manager::Service: | 44 // service_manager::Service: |
44 bool OnConnect(const service_manager::ServiceInfo& remote_info, | 45 void OnBindInterface(const service_manager::ServiceInfo& source_info, |
45 service_manager::InterfaceRegistry* registry) override; | 46 const std::string& interface_name, |
| 47 mojo::ScopedMessagePipeHandle interface_pipe) override; |
46 | 48 |
47 // service_manager::InterfaceFactory<ServiceFactory> | 49 // service_manager::InterfaceFactory<ServiceFactory> |
48 void Create(const service_manager::Identity& remote_identity, | 50 void Create(const service_manager::Identity& remote_identity, |
49 mojo::InterfaceRequest<ServiceFactory> request) override; | 51 mojo::InterfaceRequest<ServiceFactory> request) override; |
50 | 52 |
51 // ServiceFactory: | 53 // ServiceFactory: |
52 void CreateService(service_manager::mojom::ServiceRequest request, | 54 void CreateService(service_manager::mojom::ServiceRequest request, |
53 const std::string& mojo_name) override; | 55 const std::string& mojo_name) override; |
54 | 56 |
55 private: | 57 private: |
56 std::unique_ptr<service_manager::Service> CreateService( | 58 std::unique_ptr<service_manager::Service> CreateService( |
57 const std::string& name); | 59 const std::string& name); |
58 | 60 |
59 std::unique_ptr<service_manager::ServiceContext> context_; | 61 std::unique_ptr<service_manager::ServiceContext> context_; |
| 62 service_manager::BinderRegistry registry_; |
60 mojo::BindingSet<ServiceFactory> service_factory_bindings_; | 63 mojo::BindingSet<ServiceFactory> service_factory_bindings_; |
61 | 64 |
62 DISALLOW_COPY_AND_ASSIGN(MashPackagedService); | 65 DISALLOW_COPY_AND_ASSIGN(MashPackagedService); |
63 }; | 66 }; |
64 | 67 |
65 } // namespace mash | 68 } // namespace mash |
66 | 69 |
67 #endif // MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_ | 70 #endif // MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_ |
OLD | NEW |