chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js - Issue 2186623002: Minimal attestation-based enrollment flow.

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/oobe_screen_oauth_enrollment.js

Issue 2186623002: Minimal attestation-based enrollment flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Made ZTE independent of enterprise enrollment. Created 4 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

« chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc ('K') | « chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ab340a07ec31a09d22081b06299469237193d101..7eb33c9514a0cc5d2a319ef03826a9e169be8a77 100644

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

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

@@ -231,7 +231,8 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {

/**

- * Cancels enrollment and drops the user back to the login screen.

+ * Cancels the current authentication and drops the user back to the next

+ * screen (either the next authentication or the login screen).

cancel: function() {

if (this.isCancelDisabled)

@@ -277,6 +278,7 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {

this.showStep(STEP_ATTRIBUTE_PROMPT_ERROR);

return;

}

+ this.isCancelDisabled_ = false;

$('oauth-enroll-error-card').textContent = message;

$('oauth-enroll-error-card').buttonLabel =

retry ? loadTimeData.getString('oauthEnrollRetry') : '';