chrome/browser/policy/configuration_policy_provider.cc - Issue 9911029: Refactored the CloudPolicyProvider so that it becomes initialized once and stays initialized.

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_provider.cc

Issue 9911029: Refactored the CloudPolicyProvider so that it becomes initialized once and stays initialized. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Updated expectations in failing browser_tests Created 8 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

« chrome/browser/policy/cloud_policy_provider_unittest.cc ('K') | « chrome/browser/policy/cloud_policy_subsystem_unittest.cc ('k') | chrome/browser/policy/device_policy_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_provider.cc

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

index 6859c4b7756a3bd0c7f533d418c8494833fc2797..84ba1f6b3dc2cffa126f52dea02a880090c1870f 100644

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

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

@@ -97,7 +97,11 @@ void ConfigurationPolicyProvider::FixDeprecatedPolicies(PolicyMap* policies) {

policies->Erase(kProxyPolicies[i]);

}

- if (!proxy_settings->empty() && !policies->Get(key::kProxySettings)) {

+ // Sets the new |proxy_settings| if kProxySettings isn't set yet, or if the

+ // new priority is higher.

+ const PolicyMap::Entry* existing = policies->Get(key::kProxySettings);

+ if (!proxy_settings->empty() &&

+ (!existing || current_priority.has_higher_priority_than(*existing))) {

Mattias Nissler (ping if slow) 2012/03/30 08:48:46 good catch.

policies->Set(key::kProxySettings,

current_priority.level,

current_priority.scope,