Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3701)

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 1052673002: Expose kDeviceLoginScreenDomainAutoComplete through CrosSettings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bfc5b14666ff5753cc63e5c249628475e7629644..5e3c970e5e59b7a55bd23aed75f5b1b3f277d1e9 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -595,18 +595,6 @@ 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);
- }
}
}
@@ -770,6 +758,16 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
nullptr);
}
}
+
+ if (policy.has_login_screen_domain_auto_complete()) {
+ const em::LoginScreenDomainAutoCompleteProto& container(
+ policy.login_screen_domain_auto_complete());
+ policies->Set(
+ key::kDeviceLoginScreenDomainAutoComplete, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ new base::StringValue(container.login_screen_domain_auto_complete()),
+ nullptr);
+ }
}
} // namespace
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698