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

Unified Diff: ui/login/account_picker/user_pod_row.js

Issue 899663003: New icons used for indication of kids accounts on sign-in screen. Icons for supervised accounts ret… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unused var removed. Created 5 years, 11 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/screens/user_selection_screen.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 96f6e24e554d710e4892a14b662a539a43d9e75f..0f4a274c0b4db9cc721d91132011618c15adf94a 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);
« no previous file with comments | « chrome/browser/chromeos/login/screens/user_selection_screen.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698