chrome/browser/chromeos/policy/device_local_account_policy_provider.cc - Issue 1304843004: Add source column to chrome://policy showing the origins of policies.

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/chromeos/policy/device_local_account_policy_provider.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Increased ID range for Messages. Created 5 years, 3 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/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc » ('j') | chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 ca40ec6395be301d49a17859bd5a98cda41f179d..dd68257152056f24e6b787a2bcd4f939db704805 100644

--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc

+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc

@@ -29,6 +29,7 @@ DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider(

store_initialized_(false),

waiting_for_policy_refresh_(false),

weak_factory_(this) {

+ source_ = POLICY_SOURCE_CLOUD;

Thiemo Nagel 2015/09/04 20:15:53 I'd suggest to add a comment why this always is cl

fhorschig 2015/09/07 14:09:33 Done.

service_->AddObserver(this);

UpdateFromBroker();

}

@@ -170,8 +171,12 @@ void DeviceLocalAccountPolicyProvider::UpdateFromBroker() {

it != chrome_policy_overrides_->end();

++it) {

const PolicyMap::Entry& entry = it->second;

- chrome_policy.Set(

- it->first, entry.level, entry.scope, entry.value->DeepCopy(), NULL);

+ chrome_policy.SetWithSource(it->first,

+ entry.level,

+ entry.scope,

+ entry.value->DeepCopy(),

+ NULL,

+ POLICY_SOURCE_ENFORCED);

}