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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2230533002: Delete dead consumer enrollment code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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
« no previous file with comments | « chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc ('k') | chrome/browser/chromeos/settings/device_settings_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index 031449c520a84dd7f78834fcba96f17644227d04..f91b2cc7d6c2ba0427a432a3994ad8a71b7c0f46 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -683,15 +683,9 @@ void DeviceSettingsProvider::UpdateValuesCache(
TrustedStatus trusted_status) {
PrefValueMap new_values_cache;
- // If the device is not managed, or is consumer-managed, we set the device
- // owner value.
- if (policy_data.has_username() &&
- (policy::GetManagementMode(policy_data) ==
- policy::MANAGEMENT_MODE_LOCAL_OWNER ||
- policy::GetManagementMode(policy_data) ==
- policy::MANAGEMENT_MODE_CONSUMER_MANAGED)) {
+ // If the device is not managed, we set the device owner value.
+ if (policy_data.has_username() && !policy_data.has_request_token())
new_values_cache.SetString(kDeviceOwner, policy_data.username());
- }
if (policy_data.has_service_account_identity()) {
new_values_cache.SetString(kServiceAccountIdentity,
« no previous file with comments | « chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc ('k') | chrome/browser/chromeos/settings/device_settings_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698