Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2195)

Unified Diff: chrome/browser/resources/login/user_pod_row.js

Issue 283363006: You should be able to deselect the only user pod in the desktop user manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix leftover rename. reading bot errors helps >.< Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/login/user_pod_row.js
diff --git a/chrome/browser/resources/login/user_pod_row.js b/chrome/browser/resources/login/user_pod_row.js
index b6fbe379c1c7c0bde11dcca114e136ba8f6b1c2e..bd6d78c2371074e2e792d00571a4f900c087f031 100644
--- a/chrome/browser/resources/login/user_pod_row.js
+++ b/chrome/browser/resources/login/user_pod_row.js
@@ -1382,11 +1382,15 @@ cr.define('login', function() {
},
/**
- * Return true if user pod row has only single user pod in it.
+ * Return true if user pod row has only single user pod in it, which should
+ * always be focused.
* @type {boolean}
*/
- get isSinglePod() {
- return this.children.length == 1;
+ get alwaysFocusSinglePod() {
+ var isDesktopUserManager = Oobe.getInstance().displayType ==
+ DISPLAY_TYPE.DESKTOP_USER_MANAGER;
+
+ return isDesktopUserManager ? false : this.children.length == 1;
},
/**
@@ -1606,7 +1610,11 @@ cr.define('login', function() {
Oobe.getInstance().toggleClass('flying-pods', true);
}, 0);
- this.focusPod(this.preselectedPod);
+ // On desktop, don't pre-select a pod if it's the only one.
+ if (isDesktopUserManager && this.pods.length == 1)
+ this.focusPod();
+ else
+ this.focusPod(this.preselectedPod);
} else {
this.podPlacementPostponed_ = true;
@@ -1873,7 +1881,7 @@ cr.define('login', function() {
this.insideFocusPod_ = true;
for (var i = 0, pod; pod = this.pods[i]; ++i) {
- if (!this.isSinglePod) {
+ if (!this.alwaysFocusSinglePod) {
pod.isActionBoxMenuActive = false;
}
if (pod != podToFocus) {
@@ -2032,7 +2040,7 @@ cr.define('login', function() {
// Clears focus if not clicked on a pod and if there's more than one pod.
var pod = findAncestorByClass(e.target, 'pod');
- if ((!pod || pod.parentNode != this) && !this.isSinglePod) {
+ if ((!pod || pod.parentNode != this) && !this.alwaysFocusSinglePod) {
this.focusPod();
}
@@ -2040,7 +2048,7 @@ cr.define('login', function() {
pod.isActionBoxMenuHovered = true;
// Return focus back to single pod.
- if (this.isSinglePod) {
+ if (this.alwaysFocusSinglePod) {
this.focusPod(this.focusedPod_, true /* force */);
if (!pod)
this.focusedPod_.isActionBoxMenuHovered = false;
@@ -2109,7 +2117,7 @@ cr.define('login', function() {
// Do not "defocus" user pod when it is a single pod.
// That means that 'focused' class will not be removed and
// input field/button will always be visible.
- if (!this.isSinglePod)
+ if (!this.alwaysFocusSinglePod)
this.focusPod();
},
@@ -2157,7 +2165,7 @@ cr.define('login', function() {
}
break;
case 'U+001B': // Esc
- if (!this.isSinglePod)
+ if (!this.alwaysFocusSinglePod)
this.focusPod();
break;
}
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698