chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc - Issue 751703003: Implemented consumer management unenrollment.

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/chromeos/ownership/owner_settings_service_chromeos.cc

Issue 751703003: Implemented consumer management unenrollment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dcpm

Patch Set: Rebase. Created 5 years, 11 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/ownership/owner_settings_service_chromeos.h ('k') | chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

index 1b5f55e61f0d200bc85c58a1041b26eac3daa30f..dd71fcf3dc9003172db8bfd8ff272161aaa4be18 100644

--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

@@ -719,8 +719,16 @@ void OwnerSettingsServiceChromeOS::StorePendingChanges() {

if (has_pending_management_settings_) {

policy::SetManagementMode(*policy,

pending_management_settings_.management_mode);

- policy->set_request_token(pending_management_settings_.request_token);

- policy->set_device_id(pending_management_settings_.device_id);

+ if (pending_management_settings_.request_token.empty())

+ policy->clear_request_token();

+ else

+ policy->set_request_token(pending_management_settings_.request_token);

+ if (pending_management_settings_.device_id.empty())

+ policy->clear_device_id();

+ else

+ policy->set_device_id(pending_management_settings_.device_id);

}

has_pending_management_settings_ = false;