Index: chrome/browser/resources/chromeos/login/screen_account_picker.js |
diff --git a/chrome/browser/resources/chromeos/login/screen_account_picker.js b/chrome/browser/resources/chromeos/login/screen_account_picker.js |
index 7c85f8f7d13cd5b30c2f4479c30b23ee93f223ce..a59724082ce65677d66bceefb14a71ec870145ab 100644 |
--- a/chrome/browser/resources/chromeos/login/screen_account_picker.js |
+++ b/chrome/browser/resources/chromeos/login/screen_account_picker.js |
@@ -39,8 +39,17 @@ cr.define('login', function() { |
* @param data {string} Screen init payload. |
*/ |
onBeforeShow: function(data) { |
- $('add-user-header-bar-item').hidden = false; |
- $('pod-row').handleShow(); |
+ var podRow = $('pod-row'); |
+ podRow.handleShow(); |
+ |
+ // If this is showing for the lock screen display the sign out button, |
+ // hide the add user button and activate the locked user's pod. |
+ var lockedPod = podRow.lockedPod; |
+ $('add-user-header-bar-item').hidden = !!lockedPod; |
+ $('sign-out-user-item').hidden = !lockedPod; |
+ if (lockedPod) |
+ podRow.focusPod(lockedPod); |
+ |
if (this.firstShown_) { |
this.firstShown_ = false; |
// TODO(nkostylev): Enable animation back when session start jank |
@@ -70,14 +79,6 @@ cr.define('login', function() { |
*/ |
AccountPickerScreen.loadUsers = function(users, animated) { |
$('pod-row').loadPods(users, animated); |
- |
- // If this is showing for the lock screen display the sign out button, hide |
- // the add user button and activate the locked user's pod. |
- var lockedPod = $('pod-row').lockedPod; |
- $('add-user-header-bar-item').hidden = !!lockedPod; |
- $('sign-out-user-item').hidden = !lockedPod; |
- if (lockedPod) |
- lockedPod.activate(); |
}; |
/** |