| 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 fc22bbf3412b1e01fe18bcfb3857a202b4f6290e..b3ad469036be626bf9e4aaf9e074b4b35c10dcd8 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',
|
| + 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}
|
| @@ -212,6 +225,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 =
|
| @@ -236,6 +251,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)
|
| @@ -304,7 +321,7 @@ cr.define('login', function() {
|
| */
|
| HeaderBar.animateIn = function(callback) {
|
| $('login-header-bar').animateIn(callback);
|
| - }
|
| + };
|
|
|
| return {
|
| HeaderBar: HeaderBar
|
|
|