Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/settings/device_settings_service.cc

Issue 751703003: Implemented consumer management unenrollment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dcpm
Patch Set: Created 6 years, 1 month 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/fake_device_cloud_policy_manager.h ('K') | « chrome/browser/chromeos/policy/fake_device_cloud_policy_manager.cc ('k') | chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc » ('j') | components/policy/core/common/cloud/cloud_policy_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/device_settings_service.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_service.cc b/chrome/browser/chromeos/settings/device_settings_service.cc
index 1daae6cefc4aacce01b57da52fb4b929eaf24c80..50a239a83ef171286afa6ca0ce83c9864bc91250 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service.cc
@@ -169,8 +169,14 @@ void DeviceSettingsService::SetManagementSettings(
}
policy->set_management_mode(management_mode);
- policy->set_request_token(request_token);
- policy->set_device_id(device_id);
+ if (request_token.empty())
+ policy->clear_request_token();
+ else
+ policy->set_request_token(request_token);
+ if (device_id.empty())
bartfab (slow) 2014/11/28 13:25:18 Nit: I think it would be more readable if you adde
davidyu 2014/12/01 17:05:23 Done.
+ policy->clear_device_id();
+ else
+ policy->set_device_id(device_id);
EnqueueSignAndStore(policy.Pass(), callback);
}
« chrome/browser/chromeos/policy/fake_device_cloud_policy_manager.h ('K') | « chrome/browser/chromeos/policy/fake_device_cloud_policy_manager.cc ('k') | chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc » ('j') | components/policy/core/common/cloud/cloud_policy_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698