| 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..a0a827aa24d2a973aa4cfbfd7c1bee3a0fbdf7d5 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -25,6 +25,7 @@
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| +#include "components/policy/core/common/cloud/cloud_policy_constants.h"
|
| #include "policy/proto/device_management_backend.pb.h"
|
|
|
| using google::protobuf::RepeatedField;
|
| @@ -614,8 +615,10 @@ 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::GetManagementMode(policy_data) ==
|
| + policy::MANAGEMENT_MODE_LOCAL ||
|
| + policy::GetManagementMode(policy_data) ==
|
| + policy::MANAGEMENT_MODE_CONSUMER)) {
|
| new_values_cache.SetString(kDeviceOwner, policy_data.username());
|
| }
|
|
|
|
|