| 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/init/init.h" | 5 #include "mash/init/init.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/guid.h" | 9 #include "base/guid.h" |
| 10 #include "mash/login/public/interfaces/login.mojom.h" | 10 #include "mash/login/public/interfaces/login.mojom.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 bool Init::AcceptConnection(mojo::Connection* connection) { | 31 bool Init::AcceptConnection(mojo::Connection* connection) { |
| 32 connection->AddInterface<mojom::Init>(this); | 32 connection->AddInterface<mojom::Init>(this); |
| 33 return true; | 33 return true; |
| 34 } | 34 } |
| 35 | 35 |
| 36 void Init::StartService(const mojo::String& name, | 36 void Init::StartService(const mojo::String& name, |
| 37 const mojo::String& user_id) { | 37 const mojo::String& user_id) { |
| 38 if (user_services_.find(user_id) == user_services_.end()) { | 38 if (user_services_.find(user_id) == user_services_.end()) { |
| 39 mojo::Connector::ConnectParams params(mojo::Identity(name, user_id)); | 39 mojo::Connector::ConnectParams params(mojo::Identity(name, user_id)); |
| 40 scoped_ptr<mojo::Connection> connection = connector_->Connect(¶ms); | 40 std::unique_ptr<mojo::Connection> connection = connector_->Connect(¶ms); |
| 41 connection->SetConnectionLostClosure( | 41 connection->SetConnectionLostClosure( |
| 42 base::Bind(&Init::UserServiceQuit, base::Unretained(this), user_id)); | 42 base::Bind(&Init::UserServiceQuit, base::Unretained(this), user_id)); |
| 43 user_services_[user_id] = std::move(connection); | 43 user_services_[user_id] = std::move(connection); |
| 44 } | 44 } |
| 45 } | 45 } |
| 46 | 46 |
| 47 void Init::StopServicesForUser(const mojo::String& user_id) { | 47 void Init::StopServicesForUser(const mojo::String& user_id) { |
| 48 auto it = user_services_.find(user_id); | 48 auto it = user_services_.find(user_id); |
| 49 if (it != user_services_.end()) | 49 if (it != user_services_.end()) |
| 50 user_services_.erase(it); | 50 user_services_.erase(it); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 71 void Init::StartLogin() { | 71 void Init::StartLogin() { |
| 72 login_connection_ = connector_->Connect("mojo:login"); | 72 login_connection_ = connector_->Connect("mojo:login"); |
| 73 login_connection_->AddInterface<mojom::Init>(this); | 73 login_connection_->AddInterface<mojom::Init>(this); |
| 74 mash::login::mojom::LoginPtr login; | 74 mash::login::mojom::LoginPtr login; |
| 75 login_connection_->GetInterface(&login); | 75 login_connection_->GetInterface(&login); |
| 76 login->ShowLoginUI(); | 76 login->ShowLoginUI(); |
| 77 } | 77 } |
| 78 | 78 |
| 79 } // namespace init | 79 } // namespace init |
| 80 } // namespace main | 80 } // namespace main |
| OLD | NEW |