diff options
| -rw-r--r-- | chrome/browser/resources/chromeos/login/header_bar.js | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.js | 5 | ||||
| -rw-r--r-- | ui/login/display_manager.js | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/chromeos/login/header_bar.js index abfba3c..0763c34 100644 --- a/chrome/browser/resources/chromeos/login/header_bar.js +++ b/chrome/browser/resources/chromeos/login/header_bar.js @@ -312,6 +312,8 @@ cr.define('login', function() { */ updateUI_: function() { var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN); + var enrollmentIsActive = + (this.signinUIState_ == SIGNIN_UI_STATE.ENROLLMENT); var accountPickerIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER); var supervisedUserCreationDialogIsActive = @@ -340,6 +342,7 @@ cr.define('login', function() { $('add-user-button').hidden = (!this.isNewGaiaFlow_ && !accountPickerIsActive) || (this.isNewGaiaFlow_ && gaiaIsActive) || + enrollmentIsActive || isMultiProfilesUI || isLockScreen || supervisedUserCreationDialogIsActiveAndNotIntro; diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.js b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.js index 4cd8fe5..64bba08 100644 --- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.js +++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.js @@ -177,6 +177,7 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { * URL. */ onBeforeShow: function(data) { + $('login-header-bar').signinUIState = SIGNIN_UI_STATE.ENROLLMENT; var gaiaParams = {}; gaiaParams.gaiaUrl = data.gaiaUrl; gaiaParams.gaiaPath = 'embedded/setup/chromeos'; @@ -199,6 +200,10 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { this.showStep(STEP_SIGNIN); }, + onBeforeHide: function() { + $('login-header-bar').signinUIState = SIGNIN_UI_STATE.HIDDEN; + }, + /** * Shows attribute-prompt step with pre-filled asset ID and * location. diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js index d3cd073..b00111c2 100644 --- a/ui/login/display_manager.js +++ b/ui/login/display_manager.js @@ -64,6 +64,7 @@ SAML_PASSWORD_CONFIRM: 5, CONSUMER_MANAGEMENT_ENROLLMENT: 6, PASSWORD_CHANGED: 7, + ENROLLMENT: 8 }; /* Possible UI states of the error screen. */ |