chrome/browser/ui/webui/options/chromeos/consumer_management_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/options/chromeos/consumer_management_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/chromeos/policy/consumer_management_service.cc ('K') | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

index b173504a435bd052683742f5c660ee51852155c3..45f106d3b71516b90e3d7f34e6b64c15129cec37 100644

--- a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

@@ -64,7 +64,6 @@ void ConsumerManagementHandler::GetLocalizedValues(

}

void ConsumerManagementHandler::RegisterMessages() {

- // Callback to show keyboard overlay.

web_ui()->RegisterMessageCallback(

"enrollConsumerManagement",

base::Bind(&ConsumerManagementHandler::HandleEnrollConsumerManagement,

@@ -84,8 +83,8 @@ void ConsumerManagementHandler::HandleEnrollConsumerManagement(

}

CHECK(management_service_);

- management_service_->SetEnrollmentState(

- policy::ConsumerManagementService::ENROLLMENT_REQUESTED);

+ management_service_->SetEnrollmentStage(

+ policy::ConsumerManagementService::ENROLLMENT_STAGE_REQUESTED);

chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();

}