components/policy/core/common/cloud/component_cloud_policy_store.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: components/policy/core/common/cloud/component_cloud_policy_store.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: Fixed another test. 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 | « components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc ('k') | components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/cloud/component_cloud_policy_store.cc

diff --git a/components/policy/core/common/cloud/component_cloud_policy_store.cc b/components/policy/core/common/cloud/component_cloud_policy_store.cc

index 5e2874de0d6b79af336fdd4046ac49beea8b7ef9..b836cebbc6869e4233cd4f9fa4f53359064844b8 100644

--- a/components/policy/core/common/cloud/component_cloud_policy_store.cc

+++ b/components/policy/core/common/cloud/component_cloud_policy_store.cc

@@ -13,6 +13,7 @@

#include "components/policy/core/common/cloud/cloud_policy_validator.h"

#include "components/policy/core/common/external_data_fetcher.h"

#include "components/policy/core/common/policy_map.h"

+#include "components/policy/core/common/policy_types.h"

#include "crypto/sha2.h"

#include "policy/proto/chrome_extension_policy.pb.h"

#include "policy/proto/device_management_backend.pb.h"

@@ -353,7 +354,8 @@ bool ComponentCloudPolicyStore::ParsePolicy(const std::string& data,

// If policy for components is ever used for device-level settings then

// this must support a configurable scope; assuming POLICY_SCOPE_USER is

// fine for now.

- policy->Set(it.key(), level, POLICY_SCOPE_USER, value.release(), NULL);

+ policy->Set(it.key(), level, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,

+ value.release(), nullptr);

}

return true;