chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc - Issue 493613002: Add an enrolling state for consumer management section in settings page.

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/gaia_screen_handler.cc

Issue 493613002: Add an enrolling state for consumer management section in settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dn

Patch Set: Fixed broken browser tests. Created 6 years, 3 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/options/chromeos/consumer_management_overlay.js ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c964530eb7fd7e9aed0ad37d279dc77a62b2b787..0c0dbe0d0642238446f31f044bed2ff61de95ca8 100644

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

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

@@ -392,12 +392,13 @@ void GaiaScreenHandler::OnSetOwnerDone(const std::string& typed_email,

bool success) {

CHECK(consumer_management_);

if (success) {

- consumer_management_->SetEnrollmentState(

- policy::ConsumerManagementService::ENROLLMENT_OWNER_STORED);

+ consumer_management_->SetEnrollmentStage(

+ policy::ConsumerManagementService::ENROLLMENT_STAGE_OWNER_STORED);

} else {

LOG(ERROR) << "Failed to write owner e-mail to boot lockbox.";

- consumer_management_->SetEnrollmentState(

- policy::ConsumerManagementService::ENROLLMENT_BOOT_LOCKBOX_FAILED);

+ consumer_management_->SetEnrollmentStage(

+ policy::ConsumerManagementService::

+ ENROLLMENT_STAGE_BOOT_LOCKBOX_FAILED);

// We should continue logging in the user, as there's not much we can do

// here.

}