| 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 de64b1aec1bc0c6229d10eaa525cd7fbc3351dda..73595854532578bc2e9b9eae03691eecf30b9bdc 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| +#include "components/arc/arc_util.h"
|
| #include "components/policy/core/common/cloud/cloud_policy_constants.h"
|
| #include "components/policy/proto/device_management_backend.pb.h"
|
| #include "components/prefs/pref_service.h"
|
| @@ -63,6 +64,7 @@ const char* const kKnownSettings[] = {
|
| kDeviceAttestationEnabled,
|
| kDeviceDisabled,
|
| kDeviceDisabledMessage,
|
| + kDeviceEcryptfsMigrationStrategy,
|
| kDeviceLoginScreenAppInstallList,
|
| kDeviceOwner,
|
| kDeviceQuirksDownloadEnabled,
|
| @@ -339,6 +341,12 @@ void DecodeLoginPolicies(
|
| new_values_cache->SetValue(kDeviceLoginScreenInputMethods,
|
| std::move(input_methods));
|
| }
|
| +
|
| + if (policy.has_device_ecryptfs_migration_strategy()) {
|
| + new_values_cache->SetInteger(
|
| + kDeviceEcryptfsMigrationStrategy,
|
| + policy.device_ecryptfs_migration_strategy().migration_strategy());
|
| + }
|
| }
|
|
|
| void DecodeNetworkPolicies(
|
| @@ -743,8 +751,10 @@ void DeviceSettingsProvider::UpdateValuesCache(
|
| PrefValueMap new_values_cache;
|
|
|
| // If the device is not managed, we set the device owner value.
|
| - if (policy_data.has_username() && !policy_data.has_request_token())
|
| + if (policy_data.has_username() && !policy_data.has_request_token()) {
|
| new_values_cache.SetString(kDeviceOwner, policy_data.username());
|
| + arc::SetHasDeviceOwner();
|
| + }
|
|
|
| if (policy_data.has_service_account_identity()) {
|
| new_values_cache.SetString(kServiceAccountIdentity,
|
|
|