| 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/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 15 #include "mash/init/public/interfaces/init.mojom.h" | 16 #include "mash/init/public/interfaces/init.mojom.h" |
| 16 #include "mash/login/public/interfaces/login.mojom.h" | 17 #include "mash/login/public/interfaces/login.mojom.h" |
| 17 #include "mojo/public/cpp/bindings/binding_set.h" | 18 #include "mojo/public/cpp/bindings/binding_set.h" |
| 18 #include "services/service_manager/public/cpp/connector.h" | 19 #include "services/service_manager/public/cpp/connector.h" |
| 19 #include "services/service_manager/public/cpp/service.h" | 20 #include "services/service_manager/public/cpp/service.h" |
| 20 #include "services/tracing/public/cpp/provider.h" | 21 #include "services/tracing/public/cpp/provider.h" |
| 21 #include "services/ui/public/cpp/property_type_converters.h" | 22 #include "services/ui/public/cpp/property_type_converters.h" |
| 22 #include "services/ui/public/interfaces/user_access_manager.mojom.h" | 23 #include "services/ui/public/interfaces/user_access_manager.mojom.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 connector()->ConnectToInterface("service:mash_init", &init); | 144 connector()->ConnectToInterface("service:mash_init", &init); |
| 144 init->StartService("service:mash_session", user_id); | 145 init->StartService("service:mash_session", user_id); |
| 145 } | 146 } |
| 146 | 147 |
| 147 private: | 148 private: |
| 148 // service_manager::Service: | 149 // service_manager::Service: |
| 149 void OnStart(const service_manager::ServiceInfo& info) override { | 150 void OnStart(const service_manager::ServiceInfo& info) override { |
| 150 identity_ = info.identity; | 151 identity_ = info.identity; |
| 151 tracing_.Initialize(connector(), identity_.name()); | 152 tracing_.Initialize(connector(), identity_.name()); |
| 152 | 153 |
| 153 aura_init_.reset( | 154 aura_init_ = base::MakeUnique<views::AuraInit>(connector(), info.identity, |
| 154 new views::AuraInit(connector(), "views_mus_resources.pak")); | 155 "views_mus_resources.pak"); |
| 155 | 156 |
| 156 connector()->ConnectToInterface("service:ui", &user_access_manager_); | 157 connector()->ConnectToInterface("service:ui", &user_access_manager_); |
| 157 user_access_manager_->SetActiveUser(identity_.user_id()); | 158 user_access_manager_->SetActiveUser(identity_.user_id()); |
| 158 } | 159 } |
| 159 bool OnConnect(const service_manager::ServiceInfo& remote_info, | 160 bool OnConnect(const service_manager::ServiceInfo& remote_info, |
| 160 service_manager::InterfaceRegistry* registry) override { | 161 service_manager::InterfaceRegistry* registry) override { |
| 161 registry->AddInterface<mojom::Login>(this); | 162 registry->AddInterface<mojom::Login>(this); |
| 162 return true; | 163 return true; |
| 163 } | 164 } |
| 164 | 165 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 } | 201 } |
| 201 | 202 |
| 202 } // namespace | 203 } // namespace |
| 203 | 204 |
| 204 service_manager::Service* CreateLogin() { | 205 service_manager::Service* CreateLogin() { |
| 205 return new Login; | 206 return new Login; |
| 206 } | 207 } |
| 207 | 208 |
| 208 } // namespace login | 209 } // namespace login |
| 209 } // namespace main | 210 } // namespace main |
| OLD | NEW |