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

Unified Diff: chrome/browser/resources/options/managed_user_list.js

Issue 132013002: Replace own callback handling with Promises. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 6 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
Index: chrome/browser/resources/options/managed_user_list.js
diff --git a/chrome/browser/resources/options/managed_user_list.js b/chrome/browser/resources/options/managed_user_list.js
index 4af84c64c14a89d9d0f8e41c5b07f40cadce22dc..85dc31852a6ac3e0d7e6f74bdba8b8656e1c3167 100644
--- a/chrome/browser/resources/options/managed_user_list.js
+++ b/chrome/browser/resources/options/managed_user_list.js
@@ -72,7 +72,7 @@ cr.define('options.managedUserOptions', function() {
nameElement.textContent = managedUser.name;
this.appendChild(nameElement);
- if (managedUser.onCurrentDevice) {
+ if (managedUser.onCurrentDevice || managedUser.nameConflict) {
iconElement.className += ' profile-img-disabled';
nameElement.className += ' profile-name-disabled';
@@ -80,8 +80,9 @@ cr.define('options.managedUserOptions', function() {
var alreadyOnDeviceElement = this.ownerDocument.createElement('div');
alreadyOnDeviceElement.className =
'profile-name-disabled already-on-this-device';
- alreadyOnDeviceElement.textContent =
- loadTimeData.getString('managedUserAlreadyOnThisDevice');
+ alreadyOnDeviceElement.textContent = loadTimeData.getString(
+ managedUser.onCurrentDevice ? 'managedUserAlreadyOnThisDevice' :
+ 'managedUserNameConflict');
this.appendChild(alreadyOnDeviceElement);
}
},

Powered by Google App Engine
This is Rietveld 408576698