chrome/browser/policy/configuration_policy_pref_store.cc - Issue 10386097: Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/configuration_policy_pref_store.cc

Issue 10386097: Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments Created 8 years, 7 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 | « chrome/browser/policy/cloud_policy_provider.cc ('k') | chrome/browser/policy/configuration_policy_pref_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_pref_store.cc

diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc

index f18d6c518feea62be966754884f5f6b2ce06fbf3..280a29f1acfb315677cf5c33515715f1ae9f2a98 100644

--- a/chrome/browser/policy/configuration_policy_pref_store.cc

+++ b/chrome/browser/policy/configuration_policy_pref_store.cc

@@ -127,12 +127,9 @@ void ConfigurationPolicyPrefStore::Refresh() {

PrefValueMap* ConfigurationPolicyPrefStore::CreatePreferencesFromPolicies() {

scoped_ptr<PrefValueMap> prefs(new PrefValueMap);

- const PolicyMap* policies =

- policy_service_->GetPolicies(POLICY_DOMAIN_CHROME, "");

- if (!policies)

- return prefs.release();

PolicyMap filtered_policies;

- filtered_policies.CopyFrom(*policies);

+ filtered_policies.CopyFrom(

+ policy_service_->GetPolicies(POLICY_DOMAIN_CHROME, ""));

filtered_policies.FilterLevel(level_);

scoped_ptr<PolicyErrorMap> errors(new PolicyErrorMap);