| Index: chrome/browser/resources/options/chromeos/accounts_options.js
|
| diff --git a/chrome/browser/resources/options/chromeos/accounts_options.js b/chrome/browser/resources/options/chromeos/accounts_options.js
|
| index a4faaa6e8239484d7fbc8762d9d94fb45e706aac..eddbbaf3d315125629de2b2e639fa4c91a6ba860 100644
|
| --- a/chrome/browser/resources/options/chromeos/accounts_options.js
|
| +++ b/chrome/browser/resources/options/chromeos/accounts_options.js
|
| @@ -41,17 +41,15 @@ cr.define('options', function() {
|
| options.accounts.UserNameEdit.decorate(userNameEdit);
|
| userNameEdit.addEventListener('add', this.handleAddUser_);
|
|
|
| - // If the current user is not the owner, show some warning,
|
| - // and do not show the user list.
|
| + // If the current user is not the owner, do not show the user list.
|
| + // If the current user is not the owner, or the device is enterprise
|
| + // managed, show a warning that settings cannot be modified.
|
| this.showWhitelist_ = UIAccountTweaks.currentUserIsOwner();
|
| if (this.showWhitelist_) {
|
| options.accounts.UserList.decorate(userList);
|
| } else {
|
| - if (!AccountsOptions.whitelistIsManaged()) {
|
| - $('ownerOnlyWarning').hidden = false;
|
| - } else {
|
| - this.managed = true;
|
| - }
|
| + $('ownerOnlyWarning').hidden = false;
|
| + this.managed = AccountsOptions.whitelistIsManaged();
|
| }
|
|
|
| this.addEventListener('visibleChange', this.handleVisibleChange_);
|
|
|