cros: Showing pin on lock is no longer associated with sending user list.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/webui/chromeos/login/signin_screen_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 703 matching lines @@
 
     // Reset Caps Lock state when login screen is shown.
     input_method::InputMethodManager::Get()
         ->GetImeKeyboard()
         ->SetCapsLockEnabled(false);
 
     base::DictionaryValue params;
     params.SetBoolean("disableAddUser", AllWhitelistedUsersPresent());
     UpdateUIState(UI_STATE_ACCOUNT_PICKER, &params);
   }
+
+  // Enable pin for any users who can use it.
+  if (user_manager::UserManager::IsInitialized()) {
+    for (user_manager::User* user :
+         user_manager::UserManager::Get()->GetLoggedInUsers()) {

[xiyuan, 2017/04/03 21:21:43]

nit: GetLoggedInUsers() -> GetUnlockUsers() ?

There might be cases where the two are not the same.

[jdufault, 2017/04/10 21:06:31]

Done.

+      UpdatePinKeyboardState(user->GetAccountId());
+    }
+  }
 }
 
 void SigninScreenHandler::UpdateUIState(UIState ui_state,
                                         base::DictionaryValue* params) {
   switch (ui_state) {
     case UI_STATE_GAIA_SIGNIN:
       ui_state_ = UI_STATE_GAIA_SIGNIN;
       ShowScreenWithData(OobeScreen::SCREEN_GAIA_SIGNIN, params);
       break;
     case UI_STATE_ACCOUNT_PICKER:
@@ skipping 266 matching lines @@
 }
 
 void SigninScreenHandler::ClearUserPodPassword() {
   core_oobe_view_->ClearUserPodPassword();
 }
 
 void SigninScreenHandler::RefocusCurrentPod() {
   core_oobe_view_->RefocusCurrentPod();
 }
 
-void SigninScreenHandler::HidePinKeyboardIfNeeded(const AccountId& account_id) {
+void SigninScreenHandler::UpdatePinKeyboardState(const AccountId& account_id) {
   chromeos::quick_unlock::QuickUnlockStorage* quick_unlock_storage =
       chromeos::quick_unlock::QuickUnlockFactory::GetForAccountId(account_id);
-  if (quick_unlock_storage &&
-      !quick_unlock_storage->IsPinAuthenticationAvailable())
-    CallJS("login.AccountPickerScreen.disablePinKeyboardForUser", account_id);
+  if (!quick_unlock_storage)
+    return;
+
+  bool is_enabled = quick_unlock_storage->IsPinAuthenticationAvailable();
+  CallJS("login.AccountPickerScreen.setPinEnabledForUser", account_id,
+         is_enabled);
 }
 
 void SigninScreenHandler::OnUserRemoved(const AccountId& account_id,
                                         bool last_user_removed) {
   CallJS("login.AccountPickerScreen.removeUser", account_id);
   if (last_user_removed)
     OnShowAddUser();
 }
 
 void SigninScreenHandler::OnUserImageChanged(const user_manager::User& user) {
@@ skipping 106 matching lines @@
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void SigninScreenHandler::SuspendDone(const base::TimeDelta& sleep_duration) {
   for (user_manager::User* user :
        user_manager::UserManager::Get()->GetUnlockUsers()) {
-    HidePinKeyboardIfNeeded(user->GetAccountId());
+    UpdatePinKeyboardState(user->GetAccountId());
   }
 }
 
 void SigninScreenHandler::OnTouchViewToggled(bool enabled) {
   touch_view_enabled_ = enabled;
   CallJSOrDefer("login.AccountPickerScreen.setTouchViewState", enabled);
 }
 
 bool SigninScreenHandler::ShouldLoadGaia() const {
   // Fetching of the extension is not started before account picker page is
@@ skipping 22 matching lines @@
          quick_unlock_storage->IsPinAuthenticationAvailable() ||
          !authenticated_by_pin);
 
   UserContext user_context(account_id);
   user_context.SetKey(Key(password));
   user_context.SetIsUsingPin(authenticated_by_pin);
   if (account_id.GetAccountType() == AccountType::ACTIVE_DIRECTORY)
     user_context.SetUserType(user_manager::USER_TYPE_ACTIVE_DIRECTORY);
   delegate_->Login(user_context, SigninSpecifics());
 
-  HidePinKeyboardIfNeeded(account_id);
+  UpdatePinKeyboardState(account_id);
 }
 
 void SigninScreenHandler::HandleLaunchIncognito() {
   UserContext context(user_manager::USER_TYPE_GUEST, EmptyAccountId());
   if (delegate_)
     delegate_->Login(context, SigninSpecifics());
 }
 
 void SigninScreenHandler::HandleShowSupervisedUserCreationScreen() {
   if (!user_manager::UserManager::Get()->AreSupervisedUsersAllowed()) {
@@ skipping 448 matching lines @@
   rate.initial_delay_in_ms = auto_repeat_delay;
   rate.repeat_interval_in_ms = auto_repeat_interval;
   input_method::InputMethodManager::Get()
       ->GetImeKeyboard()
       ->SetAutoRepeatEnabled(true);
   input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate(
       rate);
 }
 
 }  // namespace chromeos