cros: Use first unlock user's pref for locking screen.

chrome/browser/ui/ash/session_state_delegate_chromeos.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
 
 #include "ash/multi_profile_uma.h"
 #include "ash/session_state_observer.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 
 int SessionStateDelegateChromeos::NumberOfLoggedInUsers() const {
   return chromeos::UserManager::Get()->GetLoggedInUsers().size();
 }
 
 bool SessionStateDelegateChromeos::IsActiveUserSessionStarted() const {
   return chromeos::UserManager::Get()->IsSessionStarted();
 }
 
 bool SessionStateDelegateChromeos::CanLockScreen() const {
-  return chromeos::UserManager::Get()->CanCurrentUserLock();
+  const chromeos::UserList unlock_users =
+      chromeos::UserManager::Get()->GetUnlockUsers();

[Mr4D (OOO till 08-26), 2013/11/22 23:30:51]

As long as there is at least one user, he should be able to lock the screen.

[Daniel Erat, 2013/11/22 23:39:41]

my question was actually about whether it's possible to have zero users that can
unlock the screen. is this method e.g. ever called from the login screen?

+  DCHECK_EQ(1u, unlock_users.size());

[Daniel Erat, 2013/11/22 23:14:47]

is this _EQ correct, or should it be DCHECK_LE(unlock_users.size(), 1u)?

[xiyuan, 2013/11/22 23:46:13]

Good catch. I did not realize this could be called before user login. So 0 is
also a valid size here.

Changed to DCHECK_LE(unlock_users.size(), 1u) and updated GetUnlockUsers to not
CHECK.

+  return !unlock_users.empty() && unlock_users[0]->can_lock();
 }
 
 bool SessionStateDelegateChromeos::IsScreenLocked() const {
   return chromeos::ScreenLocker::default_screen_locker() &&
          chromeos::ScreenLocker::default_screen_locker()->locked();
 }
 
 bool SessionStateDelegateChromeos::ShouldLockScreenBeforeSuspending() const {
-  Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
+  const chromeos::UserList unlock_users =
+      chromeos::UserManager::Get()->GetUnlockUsers();
+  DCHECK_EQ(1u, unlock_users.size());

[Daniel Erat, 2013/11/22 23:14:47]

same question here

[xiyuan, 2013/11/22 23:46:13]

Done.

+  Profile* profile =
+      !unlock_users.empty()
+          ? chromeos::UserManager::Get()->GetProfileByUser(unlock_users[0])
+          : NULL;
   return profile && profile->GetPrefs()->GetBoolean(prefs::kEnableScreenLock);
 }
 
 void SessionStateDelegateChromeos::LockScreen() {
   if (!CanLockScreen())
     return;
 
   VLOG(1) << "Requesting screen lock from SessionStateDelegate";
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       RequestLockScreen();
@@ skipping 129 matching lines @@
                     session_state_observer_list_,
                     ActiveUserChanged(active_user->email()));
 }
 
 void SessionStateDelegateChromeos::UserAddedToSession(
     const chromeos::User* added_user) {
   FOR_EACH_OBSERVER(ash::SessionStateObserver,
                     session_state_observer_list_,
                     UserAddedToSession(added_user->email()));
 }