| Index: ui/login/account_picker/user_pod_row.js
|
| diff --git a/ui/login/account_picker/user_pod_row.js b/ui/login/account_picker/user_pod_row.js
|
| index a65254b35c75fd0c87805324cd953cb9bc53a187..b7ac5c3fec682a99489531d9882301fe56e5958c 100644
|
| --- a/ui/login/account_picker/user_pod_row.js
|
| +++ b/ui/login/account_picker/user_pod_row.js
|
| @@ -771,7 +771,9 @@ cr.define('login', function() {
|
| this.userClickAuthAllowed_ = false;
|
|
|
| // Lazy load the assets needed for the polymer submit button.
|
| - if (cr.isChromeOS && !cr.ui.login.ResourceLoader.alreadyLoadedAssets(
|
| + var isLockScreen = (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK);
|
| + if (cr.isChromeOS && isLockScreen &&
|
| + !cr.ui.login.ResourceLoader.alreadyLoadedAssets(
|
| 'custom-elements-user-pod')) {
|
| cr.ui.login.ResourceLoader.registerAssets({
|
| id: 'custom-elements-user-pod',
|
| @@ -3246,7 +3248,6 @@ cr.define('login', function() {
|
| if (!this.isFocused(podToFocus))
|
| Oobe.clearErrors();
|
|
|
| - var hadFocus = !!this.focusedPod_;
|
| this.focusedPod_ = podToFocus;
|
| if (podToFocus) {
|
| // Only show the keyboard if it is fully loaded.
|
|
|