chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc - Issue 216923002: Revert "Add error message for domain mismatch on re-enrollment."

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 216923002: Revert "Add error message for domain mismatch on re-enrollment." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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/login/enrollment/enrollment_screen.cc ('k') | components/policy/core/browser/cloud/message_util.cc » ('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 6af9d52ae52360e34b1fb0b00f43d10d8fb96fe0..351163886203aa323d9987cd2f48357b984f8457 100644

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

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

@@ -239,17 +239,14 @@ void EnrollmentScreenHandler::ShowEnrollmentStatus(

case policy::EnrollmentStatus::STATUS_REGISTRATION_FAILED:

// Some special cases for generating a nicer message that's more helpful.

switch (status.client_status()) {

- case policy::DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED:

- ShowError(IDS_ENTERPRISE_ENROLLMENT_ACCOUNT_ERROR, true);

- break;

case policy::DM_STATUS_SERVICE_MISSING_LICENSES:

ShowError(IDS_ENTERPRISE_ENROLLMENT_MISSING_LICENSES_ERROR, true);

break;

case policy::DM_STATUS_SERVICE_DEPROVISIONED:

ShowError(IDS_ENTERPRISE_ENROLLMENT_DEPROVISIONED_ERROR, true);

break;

- case policy::DM_STATUS_SERVICE_DOMAIN_MISMATCH:

- ShowError(IDS_ENTERPRISE_ENROLLMENT_DOMAIN_MISMATCH_ERROR, true);

+ case policy::DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED:

+ ShowError(IDS_ENTERPRISE_ENROLLMENT_ACCOUNT_ERROR, true);

break;

default:

ShowErrorMessage(