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

Unified Diff: chrome/browser/resources/options/chromeos/accounts_options.js

Issue 11276006: Add Chrome OS-specific controlled setting indicators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/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..554cb221ce94b09acabeb70f91a32a535d14a419 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
James Hawkins 2012/10/24 15:14:41 nit: Insert a comma: "not the owner, or the device
bartfab (slow) 2012/10/24 17:33:51 Done.
+ // 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_);

Powered by Google App Engine
This is Rietveld 408576698