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); |
} |
}, |