Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a

1 files changed, 4 insertions, 0 deletions

diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
index 35abeb32ff..225bdf2d0a 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
@@ -202,6 +202,9 @@ bool EasyUnlockServiceSignin::IsAllowedInternal() {
 }
 
 void EasyUnlockServiceSignin::OnScreenDidLock() {
+  // Ensure the hardlock UI is updated when the account picker on login screen
+  // is ready.
+  MaybeShowHardlockUI();
 }
 
 void EasyUnlockServiceSignin::OnScreenDidUnlock() {
@@ -218,6 +221,7 @@ void EasyUnlockServiceSignin::OnFocusedUserChanged(const std::string& user_id) {
   user_id_ = user_id;
 
   ResetScreenlockState();
+  MaybeShowHardlockUI();
 
   if (should_update_app_state) {
     UpdateAppState();