Chromium Code Reviews| 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 fa337531b9ad511acb8e5e9a57ea5dbd1c2bebab..fff1c0365be3cabdc637f723625c4ed223e3a58f 100644 |
| --- a/chrome/browser/resources/options/browser_options.js |
| +++ b/chrome/browser/resources/options/browser_options.js |
| @@ -478,15 +478,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'); |
| }; |
| } |
| @@ -1973,6 +1966,39 @@ cr.define('options', function() { |
| BrowserOptions.getLoggedInUsername = function() { |
| return BrowserOptions.getInstance().username_; |
| }; |
| + |
| + /** |
| + * Shows different button text for each consumer management enrollment |
| + * status. |
| + * @enum {string} status Consumer management service status string. |
| + */ |
| + BrowserOptions.setConsumerManagementStatus = function(status) { |
|
Dan Beam
2014/09/05 19:26:49
nit: consider a switch() (which works on strings i
davidyu
2014/09/09 03:35:00
Done.
|
| + var button = $('consumer-management-button'); |
| + if (status == 'StatusUnknown') { |
| + button.hidden = true; |
| + return; |
| + } |
| + |
| + button.hidden = false; |
| + var strId; |
| + if (status == ConsumerManagementOverlay.Status.STATUS_UNENROLLED) { |
| + strId = 'consumerManagementEnrollButton'; |
| + button.disabled = false; |
| + ConsumerManagementOverlay.setStatus(status); |
| + } else if (status == ConsumerManagementOverlay.Status.STATUS_ENROLLING) { |
| + strId = 'consumerManagementEnrollingButton'; |
| + button.disabled = true; |
| + } else if (status == ConsumerManagementOverlay.Status.STATUS_ENROLLED) { |
| + strId = 'consumerManagementUnenrollButton'; |
| + button.disabled = false; |
| + ConsumerManagementOverlay.setStatus(status); |
| + } else if (status == |
| + ConsumerManagementOverlay.Status.STATUS_UNENROLLING) { |
| + strId = 'consumerManagementUnenrollingButton'; |
| + button.disabled = true; |
| + } |
| + button.textContent = loadTimeData.getString(strId); |
| + }; |
| } |
| // Export |