chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc - 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/ui/webui/chromeos/login/enrollment_screen_handler.cc

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

Patch Set: Addressed achuithb's feedback. 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

« no previous file with comments | « chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc ('k') | components/policy/proto/device_management_backend.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

index 6f8bf8ae28d84df3e1aa67cc2e2f60f74ec9940c..0885d44a886d5f1c472240ef9efefbb35ec13c30 100644

--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

@@ -56,9 +56,11 @@ std::string EnrollmentModeToUIMode(policy::EnrollmentConfig::Mode mode) {

case policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT:

case policy::EnrollmentConfig::MODE_LOCAL_ADVERTISED:

case policy::EnrollmentConfig::MODE_SERVER_ADVERTISED:

+ case policy::EnrollmentConfig::MODE_ATTESTATION:

return kEnrollmentModeUIManual;

case policy::EnrollmentConfig::MODE_LOCAL_FORCED:

case policy::EnrollmentConfig::MODE_SERVER_FORCED:

+ case policy::EnrollmentConfig::MODE_ATTESTATION_FORCED:

return kEnrollmentModeUIForced;

case policy::EnrollmentConfig::MODE_RECOVERY:

return kEnrollmentModeUIRecovery;

@@ -143,7 +145,7 @@ void EnrollmentScreenHandler::RegisterMessages() {

void EnrollmentScreenHandler::SetParameters(

Controller* controller,

const policy::EnrollmentConfig& config) {

- CHECK_NE(policy::EnrollmentConfig::MODE_NONE, config.mode);

+ CHECK(config.should_enroll());

controller_ = controller;

config_ = config;

}

@@ -264,7 +266,7 @@ void EnrollmentScreenHandler::ShowEnrollmentStatus(

return;

case policy::EnrollmentStatus::STATUS_REGISTRATION_CERTIFICATE_FETCH_FAILED:

ShowError(IDS_ENTERPRISE_ENROLLMENT_STATUS_REGISTRATION_CERT_FETCH_FAILED,

- false);

+ true);

return;

case policy::EnrollmentStatus::STATUS_POLICY_FETCH_FAILED:

ShowErrorMessage(