components/policy/core/common/policy_loader_win.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/policy_loader_win.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/policy_loader_mac_unittest.cc ('k') | components/policy/core/common/policy_loader_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/policy_loader_win.cc

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

index 3516754f1460de3ba8267ca7506f6a07c1ed7ca8..279a936cf9b3d4dab4286d245e8b753b10f2c77c 100644

--- a/components/policy/core/common/policy_loader_win.cc

+++ b/components/policy/core/common/policy_loader_win.cc

@@ -44,6 +44,7 @@

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

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

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

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

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

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

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

@@ -171,7 +172,7 @@ void FilterUntrustedPolicy(PolicyMap* policy) {

}

if (invalid_policies) {

policy->Set(key::kExtensionInstallForcelist,

- map_entry->level, map_entry->scope,

+ map_entry->level, map_entry->scope, map_entry->source,

filtered_values.release(),

map_entry->external_data_fetcher);

@@ -329,7 +330,7 @@ void ParsePolicy(const RegistryDict* gpo_dict,

return;

}

- policy->LoadFrom(policy_dict, level, scope);

+ policy->LoadFrom(policy_dict, level, scope, POLICY_SOURCE_PLATFORM);

}

// Collects stats about the enterprise environment that can be used to decide