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 301e4aa8c73a30b303da1920d885fb82993fabb1..d832537b5c6c94bdc724462f1be47e64aa69650c 100644 |
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
@@ -853,6 +853,29 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, |
std::move(dict_val), nullptr); |
} |
} |
+ |
+ if (policy.has_login_screen_locales()) { |
pastarmovj
2017/01/25 15:42:20
Hmm looking into the policies in this function it
pmarko
2017/01/26 12:32:58
Done. I've moved:
existing:
LoginScreenPowerMana
|
+ std::unique_ptr<base::ListValue> locales(new base::ListValue); |
+ const em::LoginScreenLocalesProto& login_screen_locales( |
+ policy.login_screen_locales()); |
+ for (const auto& locale : login_screen_locales.login_screen_locales()) |
+ locales->AppendString(locale); |
+ policies->Set(key::kDeviceLoginScreenLocales, POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, std::move(locales), |
+ nullptr); |
+ } |
+ |
+ if (policy.has_login_screen_input_methods()) { |
+ std::unique_ptr<base::ListValue> input_methods(new base::ListValue); |
+ const em::LoginScreenInputMethodsProto& login_screen_input_methods( |
+ policy.login_screen_input_methods()); |
+ for (const auto& input_method : |
+ login_screen_input_methods.login_screen_input_methods()) |
+ input_methods->AppendString(input_method); |
+ policies->Set(key::kDeviceLoginScreenInputMethods, POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, |
+ std::move(input_methods), nullptr); |
+ } |
} |
} // namespace |