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 #include "mash/login/login.h" | 5 #include "mash/login/login.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
11 #include "base/guid.h" | 11 #include "base/guid.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 16 #include "mash/init/public/interfaces/constants.mojom.h" |
16 #include "mash/init/public/interfaces/init.mojom.h" | 17 #include "mash/init/public/interfaces/init.mojom.h" |
17 #include "mash/login/public/interfaces/login.mojom.h" | 18 #include "mash/login/public/interfaces/login.mojom.h" |
18 #include "mojo/public/cpp/bindings/binding_set.h" | 19 #include "mojo/public/cpp/bindings/binding_set.h" |
19 #include "services/service_manager/public/cpp/connector.h" | 20 #include "services/service_manager/public/cpp/connector.h" |
20 #include "services/service_manager/public/cpp/interface_factory.h" | 21 #include "services/service_manager/public/cpp/interface_factory.h" |
21 #include "services/service_manager/public/cpp/interface_registry.h" | 22 #include "services/service_manager/public/cpp/interface_registry.h" |
22 #include "services/service_manager/public/cpp/service.h" | 23 #include "services/service_manager/public/cpp/service.h" |
23 #include "services/service_manager/public/cpp/service_context.h" | 24 #include "services/service_manager/public/cpp/service_context.h" |
24 #include "services/tracing/public/cpp/provider.h" | 25 #include "services/tracing/public/cpp/provider.h" |
25 #include "services/ui/public/cpp/property_type_converters.h" | 26 #include "services/ui/public/cpp/property_type_converters.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 class Login : public service_manager::Service, | 139 class Login : public service_manager::Service, |
139 public service_manager::InterfaceFactory<mojom::Login>, | 140 public service_manager::InterfaceFactory<mojom::Login>, |
140 public mojom::Login { | 141 public mojom::Login { |
141 public: | 142 public: |
142 Login() {} | 143 Login() {} |
143 ~Login() override {} | 144 ~Login() override {} |
144 | 145 |
145 void LoginAs(const std::string& user_id) { | 146 void LoginAs(const std::string& user_id) { |
146 user_access_manager_->SetActiveUser(user_id); | 147 user_access_manager_->SetActiveUser(user_id); |
147 mash::init::mojom::InitPtr init; | 148 mash::init::mojom::InitPtr init; |
148 context()->connector()->ConnectToInterface("mash_init", &init); | 149 context()->connector()->ConnectToInterface(init::mojom::kServiceName, |
| 150 &init); |
149 init->StartService("mash_session", user_id); | 151 init->StartService("mash_session", user_id); |
150 } | 152 } |
151 | 153 |
152 private: | 154 private: |
153 // service_manager::Service: | 155 // service_manager::Service: |
154 void OnStart() override { | 156 void OnStart() override { |
155 tracing_.Initialize(context()->connector(), context()->identity().name()); | 157 tracing_.Initialize(context()->connector(), context()->identity().name()); |
156 | 158 |
157 aura_init_ = base::MakeUnique<views::AuraInit>( | 159 aura_init_ = base::MakeUnique<views::AuraInit>( |
158 context()->connector(), context()->identity(), | 160 context()->connector(), context()->identity(), |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 } | 208 } |
207 | 209 |
208 } // namespace | 210 } // namespace |
209 | 211 |
210 service_manager::Service* CreateLogin() { | 212 service_manager::Service* CreateLogin() { |
211 return new Login; | 213 return new Login; |
212 } | 214 } |
213 | 215 |
214 } // namespace login | 216 } // namespace login |
215 } // namespace main | 217 } // namespace main |
OLD | NEW |