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

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

Issue 2570353002: Enabled default policies in Device Local Accounts (Closed)
Patch Set: Created 4 years 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/device_local_account_policy_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
index a2ce9e2d2fe7739467eaf1a3eb4e0c788b0d726e..a13065e582404bccfc4044b673a7e760cc0c69ad 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
@@ -159,10 +159,14 @@ void DeviceLocalAccountPolicyProvider::UpdateFromBroker() {
bundle->CopyFrom(policies());
}
+ PolicyMap& chrome_policy =
+ bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
+ // Apply the defaults for policies that haven't been configured by the
+ // administrator given that this is an enterprise user.
+ SetEnterpriseUsersDefaults(&chrome_policy);
+
// Apply overrides.
if (chrome_policy_overrides_) {
- PolicyMap& chrome_policy =
- bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
for (const auto& policy_override : *chrome_policy_overrides_) {
const PolicyMap::Entry& entry = policy_override.second;
chrome_policy.Set(policy_override.first, entry.level, entry.scope,
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698