| 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_INIT_INIT_H_ | 5 #ifndef MASH_INIT_INIT_H_ |
| 6 #define MASH_INIT_INIT_H_ | 6 #define MASH_INIT_INIT_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "mash/init/public/interfaces/init.mojom.h" | 13 #include "mash/init/public/interfaces/init.mojom.h" |
| 14 #include "mojo/public/cpp/bindings/binding_set.h" | 14 #include "mojo/public/cpp/bindings/binding_set.h" |
| 15 #include "services/service_manager/public/cpp/connector.h" | 15 #include "services/service_manager/public/cpp/connector.h" |
| 16 #include "services/service_manager/public/cpp/service.h" | 16 #include "services/service_manager/public/cpp/service.h" |
| 17 | 17 |
| 18 namespace mojo { | 18 namespace mojo { |
| 19 class Connection; | 19 class Connection; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace mash { | 22 namespace mash { |
| 23 namespace init { | 23 namespace init { |
| 24 | 24 |
| 25 class Init : public shell::Service, | 25 class Init : public service_manager::Service, |
| 26 public shell::InterfaceFactory<mojom::Init>, | 26 public service_manager::InterfaceFactory<mojom::Init>, |
| 27 public mojom::Init { | 27 public mojom::Init { |
| 28 public: | 28 public: |
| 29 Init(); | 29 Init(); |
| 30 ~Init() override; | 30 ~Init() override; |
| 31 | 31 |
| 32 private: | 32 private: |
| 33 // shell::Service: | 33 // service_manager::Service: |
| 34 void OnStart(const shell::Identity& identity) override; | 34 void OnStart(const service_manager::Identity& identity) override; |
| 35 bool OnConnect(const shell::Identity& remote_identity, | 35 bool OnConnect(const service_manager::Identity& remote_identity, |
| 36 shell::InterfaceRegistry* registry) override; | 36 service_manager::InterfaceRegistry* registry) override; |
| 37 | 37 |
| 38 // shell::InterfaceFactory<mojom::Login>: | 38 // service_manager::InterfaceFactory<mojom::Login>: |
| 39 void Create(const shell::Identity& remote_identity, | 39 void Create(const service_manager::Identity& remote_identity, |
| 40 mojom::InitRequest request) override; | 40 mojom::InitRequest request) override; |
| 41 | 41 |
| 42 // mojom::Init: | 42 // mojom::Init: |
| 43 void StartService(const mojo::String& name, | 43 void StartService(const mojo::String& name, |
| 44 const mojo::String& user_id) override; | 44 const mojo::String& user_id) override; |
| 45 void StopServicesForUser(const mojo::String& user_id) override; | 45 void StopServicesForUser(const mojo::String& user_id) override; |
| 46 | 46 |
| 47 void UserServiceQuit(const std::string& user_id); | 47 void UserServiceQuit(const std::string& user_id); |
| 48 | 48 |
| 49 void StartTracing(); | 49 void StartTracing(); |
| 50 void StartLogin(); | 50 void StartLogin(); |
| 51 | 51 |
| 52 std::unique_ptr<shell::Connection> login_connection_; | 52 std::unique_ptr<service_manager::Connection> login_connection_; |
| 53 mojo::BindingSet<mojom::Init> init_bindings_; | 53 mojo::BindingSet<mojom::Init> init_bindings_; |
| 54 std::map<std::string, std::unique_ptr<shell::Connection>> user_services_; | 54 std::map<std::string, std::unique_ptr<service_manager::Connection>> |
| 55 user_services_; |
| 55 | 56 |
| 56 DISALLOW_COPY_AND_ASSIGN(Init); | 57 DISALLOW_COPY_AND_ASSIGN(Init); |
| 57 }; | 58 }; |
| 58 | 59 |
| 59 } // namespace init | 60 } // namespace init |
| 60 } // namespace mash | 61 } // namespace mash |
| 61 | 62 |
| 62 #endif // MASH_INIT_INIT_H_ | 63 #endif // MASH_INIT_INIT_H_ |
| OLD | NEW |