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 | 10 |
10 #include "base/callback.h" | 11 #include "base/callback.h" |
11 #include "base/macros.h" | 12 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.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 "mojo/shell/public/cpp/connector.h" | 15 #include "mojo/shell/public/cpp/connector.h" |
16 #include "mojo/shell/public/cpp/shell_client.h" | 16 #include "mojo/shell/public/cpp/shell_client.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 { |
(...skipping 21 matching lines...) Expand all Loading... |
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 StartResourceProvider(); | 50 void StartResourceProvider(); |
51 void StartLogin(); | 51 void StartLogin(); |
52 | 52 |
53 mojo::Connector* connector_; | 53 mojo::Connector* connector_; |
54 scoped_ptr<mojo::Connection> login_connection_; | 54 std::unique_ptr<mojo::Connection> login_connection_; |
55 mojo::BindingSet<mojom::Init> init_bindings_; | 55 mojo::BindingSet<mojom::Init> init_bindings_; |
56 std::map<std::string, scoped_ptr<mojo::Connection>> user_services_; | 56 std::map<std::string, std::unique_ptr<mojo::Connection>> user_services_; |
57 | 57 |
58 DISALLOW_COPY_AND_ASSIGN(Init); | 58 DISALLOW_COPY_AND_ASSIGN(Init); |
59 }; | 59 }; |
60 | 60 |
61 } // namespace init | 61 } // namespace init |
62 } // namespace mash | 62 } // namespace mash |
63 | 63 |
64 #endif // MASH_INIT_INIT_H_ | 64 #endif // MASH_INIT_INIT_H_ |
OLD | NEW |