chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc - Issue 536573003: Add ExtensionManagement based ExternalLoader

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/extensions/device_local_account_external_policy_loader.cc

Issue 536573003: Add ExtensionManagement based ExternalLoader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext-2

Patch Set: fix broken browser tests Created 6 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 | « no previous file | chrome/browser/chromeos/policy/device_local_account_extension_tracker.cc » ('j') | chrome/browser/extensions/api/management/management_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

index 0ce971ec7f656d410a1c4bb71ec0a36614badb4f..dc1174132012e8484f98b36fb23b56a2e5431076 100644

--- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

+++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

@@ -94,6 +94,8 @@ DeviceLocalAccountExternalPolicyLoader::

void DeviceLocalAccountExternalPolicyLoader::UpdateExtensionListFromStore() {

scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);

const policy::PolicyMap& policy_map = store_->policy_map();

+ // TODO(binjin): Use two policy handlers here after

+ // ExtensionManagementPolicyHandler is introduced.

extensions::ExtensionInstallForcelistPolicyHandler policy_handler;

if (policy_handler.CheckPolicySettings(policy_map, NULL)) {

PrefValueMap pref_value_map;