| 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/shell/public/cpp/connector.h" | 15 #include "services/service_manager/public/cpp/connector.h" |
| 16 #include "services/shell/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 shell::Service, |
| 26 public shell::InterfaceFactory<mojom::Init>, | 26 public shell::InterfaceFactory<mojom::Init>, |
| (...skipping 26 matching lines...) Expand all Loading... |
| 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<shell::Connection>> user_services_; |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(Init); | 56 DISALLOW_COPY_AND_ASSIGN(Init); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace init | 59 } // namespace init |
| 60 } // namespace mash | 60 } // namespace mash |
| 61 | 61 |
| 62 #endif // MASH_INIT_INIT_H_ | 62 #endif // MASH_INIT_INIT_H_ |
| OLD | NEW |