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..8051acd30ace1094e15ab56894c512aee2118a10 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,18 @@ 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.has_login_screen_domain_auto_complete() |
Andrew T Wilson (Slow)
2015/04/01 13:33:21
This doesn't look like it compiles. I wonder if we
peletskyi
2015/04/01 13:55:19
I've fixed this. About names - I just follow the c
|
+ .has_login_screen_domain_auto_complete() && |
+ !policy.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, |