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

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

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | « ui/login/account_picker/screen_account_picker.js ('k') | ui/login/display_manager.js » ('j') | 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 940feef29ed31cc9f0bc244e1cc1096786e89884..fe0d12a5e6bc1190055eeb1236c9da38ed0acf97 100644
--- a/ui/login/account_picker/user_pod_row.js
+++ b/ui/login/account_picker/user_pod_row.js
@@ -486,15 +486,14 @@ cr.define('login', function() {
loadTimeData.getStringF('ownerUserPattern', this.user_.displayName) :
this.user_.displayName;
this.actionBoxMenuTitleEmailElement.textContent = this.user_.emailAddress;
- this.actionBoxMenuTitleEmailElement.hidden =
- this.user_.locallyManagedUser;
+ this.actionBoxMenuTitleEmailElement.hidden = this.user_.supervisedUser;
this.actionBoxMenuCommandElement.textContent =
loadTimeData.getString('removeUser');
},
customizeUserPodPerUserType: function() {
- if (this.user_.locallyManagedUser && !this.user_.isDesktopUser) {
+ 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
@@ -707,7 +706,7 @@ cr.define('login', function() {
},
showSupervisedUserSigninWarning: function() {
- // Locally managed user token has been invalidated.
+ // Supervised user token has been invalidated.
// Make sure that pod is focused i.e. "Sign in" button is seen.
this.parentNode.focusPod(this);
@@ -730,7 +729,7 @@ cr.define('login', function() {
* Shows signin UI for this user.
*/
showSigninUI: function() {
- if (this.user.locallyManagedUser && !this.user.isDesktopUser) {
+ if (this.user.supervisedUser && !this.user.isDesktopUser) {
this.showSupervisedUserSigninWarning();
} else {
// Special case for multi-profiles sign in. We show users even if they
@@ -817,7 +816,7 @@ cr.define('login', function() {
* @param {Event} e Click event.
*/
handleRemoveCommandClick_: function(e) {
- if (this.user.locallyManagedUser || this.user.isDesktopUser) {
+ if (this.user.supervisedUser || this.user.isDesktopUser) {
this.showRemoveWarning_();
return;
}
@@ -875,7 +874,7 @@ cr.define('login', function() {
return;
switch (e.keyIdentifier) {
case 'Enter':
- if (this.user.locallyManagedUser || this.user.isDesktopUser) {
+ if (this.user.supervisedUser || this.user.isDesktopUser) {
// Prevent default so that we don't trigger a 'click' event on the
// remove button that will be focused.
e.preventDefault();
@@ -1257,7 +1256,7 @@ cr.define('login', function() {
this.nameElement.textContent = this.user.displayName;
var isLockedUser = this.user.needsSignin;
- var isSupervisedUser = this.user.locallyManagedUser;
+ var isSupervisedUser = this.user.supervisedUser;
this.classList.toggle('locked', isLockedUser);
this.classList.toggle('supervised-user', isSupervisedUser);
« no previous file with comments | « ui/login/account_picker/screen_account_picker.js ('k') | ui/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698