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

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 83543004: cros: Use first unlock user's pref for locking screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: possible 0 unlock users Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 2be23c265436ae8d4ab62c46349b9dd2462adeb2..53a3dece6c8d91846a90c456d3d18386dbed0abb 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -302,8 +302,8 @@ const UserList& UserManagerImpl::GetLRULoggedInUsers() {
UserList UserManagerImpl::GetUnlockUsers() const {
UserList unlock_users;
- CHECK(primary_user_);
- unlock_users.push_back(primary_user_);
+ if (primary_user_)
+ unlock_users.push_back(primary_user_);
Mr4D (OOO till 08-26) 2013/11/23 00:52:26 Just checking: So only one user can unlock the ses
return unlock_users;
}
« no previous file with comments | « no previous file | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698