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

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

Issue 493613002: Add an enrolling state for consumer management section in settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dn
Patch Set: Created 6 years, 4 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 8c7334ac5d299a9939165719a044dca997976128..267094d138a860933b374c18ac5769389f35af44 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -483,15 +483,8 @@ cr.define('options', function() {
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')
- PageManager.showPageByName('consumer-management-overlay');
+ $('consumer-management-button').onclick = function(event) {
+ PageManager.showPageByName('consumer-management-overlay');
};
}
@@ -1980,6 +1973,40 @@ cr.define('options', function() {
BrowserOptions.getLoggedInUsername = function() {
return BrowserOptions.getInstance().username_;
};
+
+ /**
+ * Shows different button text for each consumer management enrollment
+ * status.
+ * @param {string} status consumer management service status string.
bartfab (slow) 2014/08/21 11:39:35 Nit: s/consumer/Consumer/
davidyu 2014/08/22 05:14:13 Done.
+ */
+ BrowserOptions.setConsumerManagementStatus = function(status) {
+ var button = $('consumer-management-button');
+ if (status == 'STATUS_UNKNOWN') {
+ button.hidden = true;
+ return;
+ }
+
+ button.hidden = false;
+ if (status == 'STATUS_UNENROLLED') {
+ button.textContent =
+ loadTimeData.getString('consumerManagementEnrollButton');
+ button.disabled = false;
+ ConsumerManagementOverlay.setStatus(status);
+ } else if (status == 'STATUS_ENROLLING') {
+ button.textContent =
+ loadTimeData.getString('consumerManagementEnrollingButton');
+ button.disabled = true;
+ } else if (status == 'STATUS_ENROLLED') {
+ button.textContent =
+ loadTimeData.getString('consumerManagementUnenrollButton');
+ button.disabled = false;
+ ConsumerManagementOverlay.setStatus(status);
+ } else if (status == 'STATUS_UNENROLLING') {
+ button.textContent =
+ loadTimeData.getString('consumerManagementUnenrollingButton');
+ button.disabled = true;
+ }
+ };
}
// Export

Powered by Google App Engine
This is Rietveld 408576698