Chromium Code Reviews| Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
| diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
| index 6d92f46a9b8ae70289f11ba1fc6116bf25566cd9..5d6f89a87798b05397e73b36da21fdd6700ad99b 100644 |
| --- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
| +++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
| @@ -383,6 +383,25 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, |
| POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, |
| std::move(input_methods), nullptr); |
| } |
| + |
| + if (policy.has_device_ecryptfs_migration_strategy()) { |
| + const em::DeviceEcryptfsMigrationStrategyProto& container( |
| + policy.device_ecryptfs_migration_strategy()); |
| + if (container.has_migration_strategy()) { |
| + policies->Set( |
| + key::kDeviceEcryptfsMigrationStrategy, POLICY_LEVEL_MANDATORY, |
| + POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, |
| + DecodeIntegerValue(container.migration_strategy()), nullptr); |
| + } |
|
hidehiko
2017/06/01 16:07:16
What value should be set if has_migration_strategy
|
| + } else { |
| + // Missing value means the migration is not allowed. |
| + policies->Set(key::kDeviceEcryptfsMigrationStrategy, POLICY_LEVEL_MANDATORY, |
| + POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, |
| + DecodeIntegerValue( |
| + enterprise_management:: |
| + DeviceEcryptfsMigrationStrategyProto::DISALLOW_ARC), |
| + nullptr); |
| + } |
| } |
| void DecodeNetworkPolicies(const em::ChromeDeviceSettingsProto& policy, |