| 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 b330639e01b76f54452cc23036c75d048a9c7636..5b159a6f3a3d16e590c8cb832208b3318c5f1410 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/device_local_account.h"
|
| #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
|
| +#include "chrome/browser/chromeos/policy/policy_util.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/chromeos/settings/device_settings_cache.h"
|
| #include "chrome/browser/metrics/metrics_reporting_state.h"
|
| @@ -614,8 +615,8 @@ void DeviceSettingsProvider::UpdateValuesCache(
|
| // If the device is not managed, or is consumer-managed, we set the device
|
| // owner value.
|
| if (policy_data.has_username() &&
|
| - (!policy_data.has_request_token() ||
|
| - policy_data.management_mode() == em::PolicyData::CONSUMER_MANAGED)) {
|
| + (policy::PolicyUtil::IsLocalOwned(policy_data) ||
|
| + policy::PolicyUtil::IsConsumerManaged(policy_data))) {
|
| new_values_cache.SetString(kDeviceOwner, policy_data.username());
|
| }
|
|
|
|
|