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 1d79cd1b2799c3dd1f4addf23ff69a4937193981..bfc5b14666ff5753cc63e5c249628475e7629644 100644 |
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
@@ -585,6 +585,7 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, |
container.login_screen_default_screen_magnifier_type()).release(), |
NULL); |
} |
+ |
if (container.has_login_screen_default_virtual_keyboard_enabled()) { |
policies->Set( |
key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled, |
@@ -594,6 +595,18 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, |
container.login_screen_default_virtual_keyboard_enabled()), |
NULL); |
} |
+ |
+ // The behavior when policy is not set and when it is set to an empty string |
+ // is the same. Thus lets add policy to the map only if it is set and its |
+ // value is not an empty string. |
+ if (container.has_login_screen_domain_auto_complete() && |
+ !container.login_screen_domain_auto_complete().empty()) { |
+ policies->Set( |
+ key::kDeviceLoginScreenDomainAutoComplete, POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, |
+ new base::StringValue(container.login_screen_domain_auto_complete()), |
+ nullptr); |
+ } |
} |
} |