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

Unified Diff: chrome/browser/resources/options/browser_options.js

Issue 405383002: The consumer management enroll and unenroll buttons should only be visible to the device owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed a cross-platform compilation error. Created 6 years, 5 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/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index ee54e405017aa1c22eff1c4e5885a79884473447..f1c36722982370237f9de346852e28462f58824e 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -419,9 +419,14 @@ cr.define('options', function() {
// Device control section.
if (cr.isChromeOS &&
+ UIAccountTweaks.currentUserIsOwner() &&
loadTimeData.getBoolean('consumerManagementEnabled')) {
$('device-control-section').hidden = false;
+ var isEnrolled = loadTimeData.getBoolean('consumerManagementEnrolled');
+ $('consumer-management-enroll').hidden = isEnrolled;
+ $('consumer-management-unenroll').hidden = !isEnrolled;
+
$('consumer-management-section').onclick = function(event) {
// If either button is clicked.
if (event.target.tagName == 'BUTTON')
@@ -1830,7 +1835,6 @@ cr.define('options', function() {
'setAutoOpenFileTypesDisplayed',
'setBluetoothState',
'setCanSetTime',
- 'setConsumerManagementEnrollmentStatus',
'setFontSize',
'setNativeThemeButtonEnabled',
'setHighContrastCheckboxState',
@@ -1876,17 +1880,6 @@ cr.define('options', function() {
BrowserOptions.getLoggedInUsername = function() {
return BrowserOptions.getInstance().username_;
};
-
- /**
- * Shows enroll or unenroll button based on the enrollment status.
- * @param {boolean} isEnrolled Whether the device is enrolled.
- */
- BrowserOptions.setConsumerManagementEnrollmentStatus =
- function(isEnrolled) {
- $('consumer-management-enroll').hidden = isEnrolled;
- $('consumer-management-unenroll').hidden = !isEnrolled;
- ConsumerManagementOverlay.setEnrollmentStatus(isEnrolled);
- };
}
// Export

Powered by Google App Engine
This is Rietveld 408576698