Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/header_bar.js |
| diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/chromeos/login/header_bar.js |
| index 61a8a2e74605a6d6f721db309e0130022b4afa38..311912e80b1455c676685b6f8a7e4d96c113d1f1 100644 |
| --- a/chrome/browser/resources/chromeos/login/header_bar.js |
| +++ b/chrome/browser/resources/chromeos/login/header_bar.js |
| @@ -45,6 +45,9 @@ cr.define('login', function() { |
| this.handleSignoutClick_); |
| $('cancel-multiple-sign-in-button').addEventListener('click', |
| this.handleCancelMultipleSignInClick_); |
| + $('cancel-consumer-management-enrollment-button') |
| + .addEventListener('click', |
|
bartfab (slow)
2014/08/04 17:40:52
Nit: This indentation is incorrect. Either indent
davidyu
2014/08/05 07:24:05
Done.
|
| + this.handleCancelConsumerManagementEnrollmentClick_); |
| if (Oobe.getInstance().displayType == DISPLAY_TYPE.LOGIN || |
| Oobe.getInstance().displayType == DISPLAY_TYPE.OOBE) { |
| if (Oobe.getInstance().newKioskUI) |
| @@ -154,6 +157,16 @@ cr.define('login', function() { |
| }, |
| /** |
| + * Cancel consumer management enrollment button handler. |
| + * |
| + * @private |
| + */ |
| + handleCancelConsumerManagementEnrollmentClick_: function(e) { |
| + chrome.send('cancelConsumerManagementEnrollment'); |
| + e.stopPropagation(); |
| + }, |
| + |
| + /** |
| * If true then "Browse as Guest" button is shown. |
| * |
| * @type {boolean} |
| @@ -213,6 +226,8 @@ cr.define('login', function() { |
| (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING); |
| var isSamlPasswordConfirm = |
| (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM); |
| + var isEnrollingConsumerManagement = (this.signinUIState_ == |
| + SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT); |
| var isMultiProfilesUI = |
| (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING); |
| var isLockScreen = |
| @@ -237,6 +252,8 @@ cr.define('login', function() { |
| $('apps-header-bar-item').hidden = !this.hasApps_ || |
| (!gaiaIsActive && !accountPickerIsActive); |
| $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI; |
| + $('cancel-consumer-management-enrollment').hidden = |
| + !isEnrollingConsumerManagement; |
| if (!Oobe.getInstance().newKioskUI) { |
| if (!$('apps-header-bar-item').hidden) |