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

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

Issue 1014003004: Added definition of the policy DeviceLoginScreenDomainAutoComplete. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comments Created 5 years, 9 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 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);
+ }
}
}
« 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