chrome/browser/resources/chromeos/login/screen_gaia_signin.js - Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/chromeos/login/screen_gaia_signin.js

Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signin

Patch Set: Fixed the broken test. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/login/header_bar.js ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/login/screen_gaia_signin.js

diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js

index 50d0f4b0644a6f68bf9899afea01fdac6457eb89..153663d12221c56eda76bad41c30cd866f583e20 100644

--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js

+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js

@@ -220,8 +220,8 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {

chrome.send('loginUIStateChanged', ['gaia-signin', true]);

$('login-header-bar').signinUIState =

this.isEnrollingConsumerManagement_ ?

- SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT :

- SIGNIN_UI_STATE.GAIA_SIGNIN;

+ SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT :

+ SIGNIN_UI_STATE.GAIA_SIGNIN;

// Ensure that GAIA signin (or loading UI) is actually visible.

window.requestAnimationFrame(function() {

@@ -318,13 +318,13 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {

$('createSupervisedUserNoManagerText').textContent =

data.supervisedUsersRestrictionReason;

- $('consumerManagementEnrollment').hidden =

- !data.isEnrollingConsumerManagement;

+ var isEnrollingConsumerManagement = data.isEnrollingConsumerManagement;

+ $('consumerManagementEnrollment').hidden = !isEnrollingConsumerManagement;

this.isShowUsers_ = data.isShowUsers;

this.updateCancelButtonState();

- this.isEnrollingConsumerManagement_ = data.isEnrollingConsumerManagement;

+ this.isEnrollingConsumerManagement_ = isEnrollingConsumerManagement;

// Sign-in right panel is hidden if all of its items are hidden.

var noRightPanel = $('gaia-signin-reason').hidden &&