chrome/browser/ui/webui/chromeos/login/signin_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/signin_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: 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

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

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

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

index 5151a9a92556ec71643203342427d9d1075f0027..27935a49ac52bfa0d4edc10e411fd8bb48d08128 100644

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

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

@@ -304,8 +304,8 @@ SigninScreenHandler::SigninScreenHandler(

GetConsumerManagementService();

is_enrolling_consumer_management_ =

consumer_management &&

- consumer_management->GetEnrollmentState() ==

- policy::ConsumerManagementService::ENROLLMENT_REQUESTED;

+ consumer_management->GetEnrollmentStage() ==

+ policy::ConsumerManagementService::ENROLLMENT_STAGE_REQUESTED;

}

SigninScreenHandler::~SigninScreenHandler() {

@@ -1362,8 +1362,8 @@ void SigninScreenHandler::HandleCancelConsumerManagementEnrollment() {

g_browser_process->platform_part()->browser_policy_connector_chromeos()->

GetConsumerManagementService();

CHECK(consumer_management);

- consumer_management->SetEnrollmentState(

- policy::ConsumerManagementService::ENROLLMENT_CANCELED);

+ consumer_management->SetEnrollmentStage(

+ policy::ConsumerManagementService::ENROLLMENT_STAGE_CANCELED);

is_enrolling_consumer_management_ = false;

ShowImpl();

}