Index: chrome/browser/resources/settings/people_page/user_list.js |
diff --git a/chrome/browser/resources/settings/people_page/user_list.js b/chrome/browser/resources/settings/people_page/user_list.js |
index 10a3e356e80d2ef551f0598e14cce6e1e2f50ab6..f7f411f237d6262d613f14780c5af76e36bcac49 100644 |
--- a/chrome/browser/resources/settings/people_page/user_list.js |
+++ b/chrome/browser/resources/settings/people_page/user_list.js |
@@ -15,7 +15,11 @@ |
Polymer({ |
is: 'settings-user-list', |
- behaviors: [I18nBehavior, settings.RouteObserverBehavior], |
+ behaviors: [ |
+ CrScrollableBehavior, |
+ I18nBehavior, |
+ settings.RouteObserverBehavior, |
+ ], |
properties: { |
/** |
@@ -84,6 +88,7 @@ Polymer({ |
else |
return -1; |
}); |
+ this.requestUpdateScroll(); |
}, |
/** |
@@ -106,5 +111,13 @@ Polymer({ |
*/ |
getProfilePictureUrl_: function(user) { |
return 'chrome://userimage/' + user.email + '?id=' + Date.now(); |
- } |
+ }, |
+ |
+ /** |
+ * @param {chrome.usersPrivate.User} user |
+ * @private |
+ */ |
+ shouldShowEmail_: function(user) { |
+ return !user.isSupervised && user.name != user.email; |
+ }, |
}); |