summaryrefslogtreecommitdiffstats
path: root/ui/login/account_picker/user_pod_row.js
diff options
context:
space:
mode:
authormerkulova <merkulova@chromium.org>2015-02-04 01:12:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-04 09:13:27 +0000
commitbcfe80cc71cad64f8f9b1777f518641f9e96588c (patch)
tree9e4645fd438c672dba3a81751a53dde07dcc3e8f /ui/login/account_picker/user_pod_row.js
parentaa16ad225b47b9734e878bb4887651332fa12a9c (diff)
downloadchromium_src-bcfe80cc71cad64f8f9b1777f518641f9e96588c.zip
chromium_src-bcfe80cc71cad64f8f9b1777f518641f9e96588c.tar.gz
chromium_src-bcfe80cc71cad64f8f9b1777f518641f9e96588c.tar.bz2
New icons used for indication of kids accounts on sign-in screen. Icons for supervised accounts returned.
BUG=450795 Review URL: https://codereview.chromium.org/899663003 Cr-Commit-Position: refs/heads/master@{#314528}
Diffstat (limited to 'ui/login/account_picker/user_pod_row.js')
-rw-r--r--ui/login/account_picker/user_pod_row.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/login/account_picker/user_pod_row.js b/ui/login/account_picker/user_pod_row.js
index 96f6e24..0f4a274 100644
--- a/ui/login/account_picker/user_pod_row.js
+++ b/ui/login/account_picker/user_pod_row.js
@@ -1033,9 +1033,9 @@ cr.define('login', function() {
},
customizeUserPodPerUserType: function() {
- if (this.user_.isChildUser && !this.user_.isDesktopUser) {
+ if (this.user_.childUser && !this.user_.isDesktopUser) {
this.setUserPodIconType('child');
- } else if (this.user_.isSupervisedUser && !this.user_.isDesktopUser) {
+ } else if (this.user_.supervisedUser && !this.user_.isDesktopUser) {
this.setUserPodIconType('supervised');
} else if (this.multiProfilesPolicyApplied) {
// Mark user pod as not focusable which in addition to the grayed out
@@ -1931,9 +1931,8 @@ cr.define('login', function() {
this.nameElement.textContent = this.user.displayName;
var isLockedUser = this.user.needsSignin;
- var isSupervisedUser = this.user.supervisedUser;
+ var isLegacySupervisedUser = this.user.supervisedUser;
var isChildUser = this.user.childUser;
- var isLegacySupervisedUser = isSupervisedUser && !isChildUser;
this.classList.toggle('locked', isLockedUser);
this.classList.toggle('legacy-supervised', isLegacySupervisedUser);
this.classList.toggle('child', isChildUser);