Chromium Code Reviews| 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..415b2454ebda753fe5454d828a960c99d0ab8e3e 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( |
|
Greg Levin
2016/09/23 16:12:40
As per offline discussion, switched this to only a
|
| 'custom-elements-user-pod')) { |
| cr.ui.login.ResourceLoader.registerAssets({ |
| id: 'custom-elements-user-pod', |
| @@ -895,7 +897,8 @@ cr.define('login', function() { |
| * @type {!HTMLInputElement} |
| */ |
| get submitButton() { |
| - return this.querySelector('.submit-button'); |
| + return this.user_.publicAccount ? null : |
| + this.querySelector('.submit-button'); |
|
Greg Levin
2016/09/23 16:12:40
Since I'm not using this in the if-condition above
xiyuan
2016/09/23 16:26:00
I would vote for revert since it is not needed for
Greg Levin
2016/09/23 18:23:09
Done.
|
| }, |
| /** |
| @@ -3246,7 +3249,6 @@ cr.define('login', function() { |
| if (!this.isFocused(podToFocus)) |
| Oobe.clearErrors(); |
| - var hadFocus = !!this.focusedPod_; |
|
Greg Levin
2016/09/23 16:12:40
This variable doesn't appear to be used anywhere.
xiyuan
2016/09/23 16:26:01
Let's remove it then.
Greg Levin
2016/09/23 18:23:09
Done.
|
| this.focusedPod_ = podToFocus; |
| if (podToFocus) { |
| // Only show the keyboard if it is fully loaded. |