chrome/browser/policy/device_policy_cache.cc - Issue 7014036: Split the policy refresh rate preference into user- and device-policy refresh rate.

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/device_policy_cache.cc

Issue 7014036: Split the policy refresh rate preference into user- and device-policy refresh rate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: chrome/browser/policy/device_policy_cache.cc

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

index 2789b05e0764b48333f65de68e3f8cd156787134..bb9f5339146baade3d10c68e1751dbd27db7f0dd 100644

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

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

@@ -269,12 +269,13 @@ void DevicePolicyCache::DecodeDevicePolicy(

const em::ChromeDeviceSettingsProto& policy,

PolicyMap* mandatory,

PolicyMap* recommended) {

- if (policy.has_policy_refresh_rate()) {

+ if (policy.has_device_policy_refresh_rate()) {

const em::DevicePolicyRefreshRateProto container =

- policy.policy_refresh_rate();

- if (container.has_policy_refresh_rate()) {

- mandatory->Set(kPolicyPolicyRefreshRate,

- DecodeIntegerValue(container.policy_refresh_rate()));

+ policy.device_policy_refresh_rate();

+ if (container.has_device_policy_refresh_rate()) {

+ mandatory->Set(kPolicyDevicePolicyRefreshRate,

+ DecodeIntegerValue(

+ container.device_policy_refresh_rate()));

}