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

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

Issue 7171018: User Settings on CrOS now shows the managed banner for enrolled devices. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed comments. Created 9 years, 6 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
« no previous file with comments | « chrome/browser/policy/managed_prefs_banner_base.cc ('k') | chrome/browser/ui/options/options_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 25fca8c7665192ef94d3dd234825fd846fd0c557..4c814c6499950ab84160a58cf371c2cca520ade5 100644
--- a/chrome/browser/resources/options/chromeos/accounts_options.js
+++ b/chrome/browser/resources/options/chromeos/accounts_options.js
@@ -41,11 +41,13 @@ cr.define('options', function() {
// If the current user is not the owner, show some warning,
// and do not show the user list.
if (AccountsOptions.currentUserIsOwner()) {
+ options.accounts.UserList.decorate(userList);
+ } else {
if (!AccountsOptions.whitelistIsManaged()) {
- options.accounts.UserList.decorate(userList);
+ $('ownerOnlyWarning').hidden = false;
+ } else {
+ this.managed = true;
}
- } else {
- $('ownerOnlyWarning').hidden = false;
}
this.addEventListener('visibleChange', this.handleVisibleChange_);
« no previous file with comments | « chrome/browser/policy/managed_prefs_banner_base.cc ('k') | chrome/browser/ui/options/options_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698