| 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 "chrome/browser/ui/ash/session_controller_client.h" | 5 #include "chrome/browser/ui/ash/session_controller_client.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/public/cpp/session_types.h" | 10 #include "ash/public/cpp/session_types.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 // static | 116 // static |
| 117 SessionControllerClient* SessionControllerClient::Get() { | 117 SessionControllerClient* SessionControllerClient::Get() { |
| 118 return g_instance; | 118 return g_instance; |
| 119 } | 119 } |
| 120 | 120 |
| 121 void SessionControllerClient::StartLock(StartLockCallback callback) { | 121 void SessionControllerClient::StartLock(StartLockCallback callback) { |
| 122 session_controller_->StartLock(callback); | 122 session_controller_->StartLock(callback); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void SessionControllerClient::NotifyChromeLockAnimationsComplete() { |
| 126 session_controller_->NotifyChromeLockAnimationsComplete(); |
| 127 } |
| 128 |
| 125 void SessionControllerClient::RunUnlockAnimation( | 129 void SessionControllerClient::RunUnlockAnimation( |
| 126 base::Closure animation_finished_callback) { | 130 base::Closure animation_finished_callback) { |
| 127 session_controller_->RunUnlockAnimation(animation_finished_callback); | 131 session_controller_->RunUnlockAnimation(animation_finished_callback); |
| 128 } | 132 } |
| 129 | 133 |
| 130 void SessionControllerClient::RequestLockScreen() { | 134 void SessionControllerClient::RequestLockScreen() { |
| 131 DoLockScreen(); | 135 DoLockScreen(); |
| 132 } | 136 } |
| 133 | 137 |
| 134 void SessionControllerClient::SwitchActiveUser(const AccountId& account_id) { | 138 void SessionControllerClient::SwitchActiveUser(const AccountId& account_id) { |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 const UserList logged_in_users = user_manager->GetLoggedInUsers(); | 328 const UserList logged_in_users = user_manager->GetLoggedInUsers(); |
| 325 std::vector<uint32_t> user_session_ids; | 329 std::vector<uint32_t> user_session_ids; |
| 326 for (auto* user : user_manager->GetLRULoggedInUsers()) { | 330 for (auto* user : user_manager->GetLRULoggedInUsers()) { |
| 327 const uint32_t user_session_id = GetSessionId(*user); | 331 const uint32_t user_session_id = GetSessionId(*user); |
| 328 DCHECK_NE(0u, user_session_id); | 332 DCHECK_NE(0u, user_session_id); |
| 329 user_session_ids.push_back(user_session_id); | 333 user_session_ids.push_back(user_session_id); |
| 330 } | 334 } |
| 331 | 335 |
| 332 session_controller_->SetUserSessionOrder(user_session_ids); | 336 session_controller_->SetUserSessionOrder(user_session_ids); |
| 333 } | 337 } |
| OLD | NEW |