Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: chrome/browser/ui/ash/session_controller_client.cc

Issue 2836163002: mash: Shell ref clean up for screen lock (Closed)
Patch Set: rebase, fix compile Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 // static 141 // static
142 SessionControllerClient* SessionControllerClient::Get() { 142 SessionControllerClient* SessionControllerClient::Get() {
143 return g_instance; 143 return g_instance;
144 } 144 }
145 145
146 void SessionControllerClient::StartLock(StartLockCallback callback) { 146 void SessionControllerClient::StartLock(StartLockCallback callback) {
147 session_controller_->StartLock(callback); 147 session_controller_->StartLock(callback);
148 } 148 }
149 149
150 void SessionControllerClient::NotifyChromeLockAnimationsComplete() {
151 session_controller_->NotifyChromeLockAnimationsComplete();
152 }
153
150 void SessionControllerClient::RunUnlockAnimation( 154 void SessionControllerClient::RunUnlockAnimation(
151 base::Closure animation_finished_callback) { 155 base::Closure animation_finished_callback) {
152 session_controller_->RunUnlockAnimation(animation_finished_callback); 156 session_controller_->RunUnlockAnimation(animation_finished_callback);
153 } 157 }
154 158
155 void SessionControllerClient::RequestLockScreen() { 159 void SessionControllerClient::RequestLockScreen() {
156 DoLockScreen(); 160 DoLockScreen();
157 } 161 }
158 162
159 void SessionControllerClient::SwitchActiveUser(const AccountId& account_id) { 163 void SessionControllerClient::SwitchActiveUser(const AccountId& account_id) {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 const UserList logged_in_users = user_manager->GetLoggedInUsers(); 404 const UserList logged_in_users = user_manager->GetLoggedInUsers();
401 std::vector<uint32_t> user_session_ids; 405 std::vector<uint32_t> user_session_ids;
402 for (auto* user : user_manager->GetLRULoggedInUsers()) { 406 for (auto* user : user_manager->GetLRULoggedInUsers()) {
403 const uint32_t user_session_id = GetSessionId(*user); 407 const uint32_t user_session_id = GetSessionId(*user);
404 DCHECK_NE(0u, user_session_id); 408 DCHECK_NE(0u, user_session_id);
405 user_session_ids.push_back(user_session_id); 409 user_session_ids.push_back(user_session_id);
406 } 410 }
407 411
408 session_controller_->SetUserSessionOrder(user_session_ids); 412 session_controller_->SetUserSessionOrder(user_session_ids);
409 } 413 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_controller_client.h ('k') | chrome/browser/ui/ash/session_controller_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698