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

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: 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
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..5b13d1bb4cbf8d17fe1af483099134bc88df5cc6 100644
--- a/chrome/browser/resources/options/chromeos/accounts_options.js
+++ b/chrome/browser/resources/options/chromeos/accounts_options.js
@@ -41,11 +41,14 @@ 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;
+ OptionsPage.updateManagedBannerVisibility();
Mattias Nissler (ping if slow) 2011/06/15 15:02:59 Is this call really needed? I guess you should als
pastarmovj 2011/06/15 15:57:07 You are right not needed here.
}
- } else {
- $('ownerOnlyWarning').hidden = false;
}
this.addEventListener('visibleChange', this.handleVisibleChange_);

Powered by Google App Engine
This is Rietveld 408576698