Chromium Code Reviews| Index: ui/login/account_picker/screen_account_picker.js |
| diff --git a/ui/login/account_picker/screen_account_picker.js b/ui/login/account_picker/screen_account_picker.js |
| index 5d78fdc673dbcba8a2dcce7018f6c81bef8de759..01f2cf5346b9ac408816e68c8cad26f354f2a9ae 100644 |
| --- a/ui/login/account_picker/screen_account_picker.js |
| +++ b/ui/login/account_picker/screen_account_picker.js |
| @@ -5,7 +5,6 @@ |
| /** |
| * @fileoverview Account picker screen implementation. |
| */ |
| - |
| login.createScreen('AccountPickerScreen', 'account-picker', function() { |
|
jdufault
2016/06/17 18:54:22
Restore newline
sammiequon
2016/06/22 23:26:17
Done.
|
| /** |
| * Maximum number of offline login failures before online login. |
| @@ -195,7 +194,6 @@ login.createScreen('AccountPickerScreen', 'account-picker', function() { |
| } |
| } |
| }, |
| - |
| /** |
|
jdufault
2016/06/17 18:54:23
Restore newline
sammiequon
2016/06/22 23:26:17
Done.
|
| * Loads the PIN keyboard if any of the users can login with a PIN. |
| * @param {array} users Array of user instances. |
| @@ -204,7 +202,9 @@ login.createScreen('AccountPickerScreen', 'account-picker', function() { |
| for (var i = 0; i < users.length; ++i) { |
| var user = users[i]; |
| if (user.showPin) { |
| - showPinKeyboardAsync(); |
| + var pod = $('pod-row').getPodWithUsername(user.username); |
| + if(pod) |
|
jdufault
2016/06/17 18:54:23
nit: if (
sammiequon
2016/06/22 23:26:17
Done.
|
| + showPinKeyboardAsync(pod, true); |
|
jdufault
2016/06/17 18:54:22
When is there going to be a username with showPin=
sammiequon
2016/06/22 23:26:17
Done.
|
| return; |
| } |
| } |
| @@ -216,9 +216,9 @@ login.createScreen('AccountPickerScreen', 'account-picker', function() { |
| * @param {boolean} showGuest Whether to show guest session button. |
| */ |
| loadUsers: function(users, showGuest) { |
| + $('pod-row').loadPods(users); |
| this.loadPinKeyboardIfNeeded_(users); |
|
jdufault
2016/06/17 18:54:23
I'd put loadPinKeyboardIfNeeded at the end of the
sammiequon
2016/06/22 23:26:17
Done.
|
| - $('pod-row').loadPods(users); |
| $('login-header-bar').showGuestButton = showGuest; |
| // On Desktop, #login-header-bar has a shadow if there are 8+ profiles. |
| if (Oobe.getInstance().displayType == DISPLAY_TYPE.DESKTOP_USER_MANAGER) |