| 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/init.mojom.h" | 16 #include "mash/init/public/interfaces/init.mojom.h" |
| 17 #include "mash/login/public/interfaces/login.mojom.h" | 17 #include "mash/login/public/interfaces/login.mojom.h" |
| 18 #include "mojo/public/cpp/bindings/binding_set.h" | 18 #include "mojo/public/cpp/bindings/binding_set.h" |
| 19 #include "services/service_manager/public/cpp/connector.h" | 19 #include "services/service_manager/public/cpp/connector.h" |
| 20 #include "services/service_manager/public/cpp/interface_factory.h" | 20 #include "services/service_manager/public/cpp/interface_factory.h" |
| 21 #include "services/service_manager/public/cpp/interface_registry.h" | 21 #include "services/service_manager/public/cpp/interface_registry.h" |
| 22 #include "services/service_manager/public/cpp/service.h" | 22 #include "services/service_manager/public/cpp/service.h" |
| 23 #include "services/service_manager/public/cpp/service_context.h" | 23 #include "services/service_manager/public/cpp/service_context.h" |
| 24 #include "services/tracing/public/cpp/provider.h" | 24 #include "services/tracing/public/cpp/provider.h" |
| 25 #include "services/ui/public/cpp/property_type_converters.h" | 25 #include "services/ui/public/cpp/property_type_converters.h" |
| 26 #include "services/ui/public/interfaces/constants.mojom.h" |
| 26 #include "services/ui/public/interfaces/user_access_manager.mojom.h" | 27 #include "services/ui/public/interfaces/user_access_manager.mojom.h" |
| 27 #include "services/ui/public/interfaces/window_manager.mojom.h" | 28 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 28 #include "ui/views/background.h" | 29 #include "ui/views/background.h" |
| 29 #include "ui/views/controls/button/md_text_button.h" | 30 #include "ui/views/controls/button/md_text_button.h" |
| 30 #include "ui/views/mus/aura_init.h" | 31 #include "ui/views/mus/aura_init.h" |
| 31 #include "ui/views/mus/native_widget_mus.h" | 32 #include "ui/views/mus/native_widget_mus.h" |
| 32 #include "ui/views/mus/window_manager_connection.h" | 33 #include "ui/views/mus/window_manager_connection.h" |
| 33 #include "ui/views/widget/widget_delegate.h" | 34 #include "ui/views/widget/widget_delegate.h" |
| 34 | 35 |
| 35 namespace mash { | 36 namespace mash { |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 151 |
| 151 private: | 152 private: |
| 152 // service_manager::Service: | 153 // service_manager::Service: |
| 153 void OnStart() override { | 154 void OnStart() override { |
| 154 tracing_.Initialize(context()->connector(), context()->identity().name()); | 155 tracing_.Initialize(context()->connector(), context()->identity().name()); |
| 155 | 156 |
| 156 aura_init_ = base::MakeUnique<views::AuraInit>( | 157 aura_init_ = base::MakeUnique<views::AuraInit>( |
| 157 context()->connector(), context()->identity(), | 158 context()->connector(), context()->identity(), |
| 158 "views_mus_resources.pak"); | 159 "views_mus_resources.pak"); |
| 159 | 160 |
| 160 context()->connector()->ConnectToInterface( | 161 context()->connector()->ConnectToInterface(ui::mojom::kServiceName, |
| 161 "ui", &user_access_manager_); | 162 &user_access_manager_); |
| 162 user_access_manager_->SetActiveUser(context()->identity().user_id()); | 163 user_access_manager_->SetActiveUser(context()->identity().user_id()); |
| 163 } | 164 } |
| 164 | 165 |
| 165 bool OnConnect(const service_manager::ServiceInfo& remote_info, | 166 bool OnConnect(const service_manager::ServiceInfo& remote_info, |
| 166 service_manager::InterfaceRegistry* registry) override { | 167 service_manager::InterfaceRegistry* registry) override { |
| 167 registry->AddInterface<mojom::Login>(this); | 168 registry->AddInterface<mojom::Login>(this); |
| 168 return true; | 169 return true; |
| 169 } | 170 } |
| 170 | 171 |
| 171 // service_manager::InterfaceFactory<mojom::Login>: | 172 // service_manager::InterfaceFactory<mojom::Login>: |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 } | 206 } |
| 206 | 207 |
| 207 } // namespace | 208 } // namespace |
| 208 | 209 |
| 209 service_manager::Service* CreateLogin() { | 210 service_manager::Service* CreateLogin() { |
| 210 return new Login; | 211 return new Login; |
| 211 } | 212 } |
| 212 | 213 |
| 213 } // namespace login | 214 } // namespace login |
| 214 } // namespace main | 215 } // namespace main |
| OLD | NEW |