| 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 02bb836d980022db8a2b9daf7871ef30528fcb7d..e08294ccbfc7a8ef6a2b8a2a96f45f5a4b623a6f 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -82,6 +82,7 @@ const char* const kKnownSettings[] = {
|
| kDeviceDisabledMessage,
|
| kRebootOnShutdown,
|
| kExtensionCacheSize,
|
| + kDeviceLoginScreenDomainAutoComplete,
|
| };
|
|
|
| bool HasOldMetricsFile() {
|
| @@ -424,6 +425,20 @@ void DecodeGenericPolicies(
|
| kExtensionCacheSize,
|
| policy.extension_cache_size().extension_cache_size());
|
| }
|
| +
|
| + // The behavior when policy is not set and when it is set to an empty string
|
| + // is the same. Thus lets add policy only if it is set and its value is not
|
| + // an empty string.
|
| + if (policy.has_login_screen_domain_auto_complete() &&
|
| + policy.login_screen_domain_auto_complete()
|
| + .has_login_screen_domain_auto_complete() &&
|
| + !policy.login_screen_domain_auto_complete()
|
| + .login_screen_domain_auto_complete()
|
| + .empty()) {
|
| + new_values_cache->SetString(kDeviceLoginScreenDomainAutoComplete,
|
| + policy.login_screen_domain_auto_complete()
|
| + .login_screen_domain_auto_complete());
|
| + }
|
| }
|
|
|
| void DecodeDeviceState(const em::PolicyData& policy_data,
|
|
|