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 aea83e6ea6f85d6c80d20e75eed3bac97f7a7da1..f275a2545ce29116407059c72c52c538f880adc5 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'); |
}; |
} |
@@ -1978,6 +1971,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. |
Dan Beam
2014/09/04 23:12:37
can this be an @enum {string} instead?
davidyu
2014/09/05 06:14:11
Done.
|
+ */ |
+ BrowserOptions.setConsumerManagementStatus = function(status) { |
+ var button = $('consumer-management-button'); |
+ if (status == 'StatusUnknown') { |
+ button.hidden = true; |
+ return; |
+ } |
+ |
+ button.hidden = false; |
Dan Beam
2014/09/04 23:12:37
var strId;
davidyu
2014/09/05 06:14:11
Done.
|
+ if (status == 'StatusUnenrolled') { |
+ button.textContent = |
+ loadTimeData.getString('consumerManagementEnrollButton'); |
Dan Beam
2014/09/04 23:12:37
strId = 'consumerManagementEnrollButton';
davidyu
2014/09/05 06:14:11
Done.
|
+ button.disabled = false; |
+ ConsumerManagementOverlay.setStatus(status); |
+ } else if (status == 'StatusEnrolling') { |
+ button.textContent = |
+ loadTimeData.getString('consumerManagementEnrollingButton'); |
+ button.disabled = true; |
+ } else if (status == 'StatusEnrolled') { |
+ button.textContent = |
+ loadTimeData.getString('consumerManagementUnenrollButton'); |
+ button.disabled = false; |
+ ConsumerManagementOverlay.setStatus(status); |
+ } else if (status == 'StatusUnenrolling') { |
+ button.textContent = |
+ loadTimeData.getString('consumerManagementUnenrollingButton'); |
+ button.disabled = true; |
+ } |
Dan Beam
2014/09/04 23:12:37
button.textContent = loadTimeData.getString(strId)
davidyu
2014/09/05 06:14:11
Done.
|
+ }; |
} |
// Export |