chrome/browser/chromeos/policy/device_local_account_policy_provider.cc - Issue 25242002: Support policies referencing external data for device-local accounts

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 25242002: Support policies referencing external data for device-local accounts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 1 month 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_local_account_policy_provider.h ('k') | chrome/browser/chromeos/policy/device_local_account_policy_service.h » ('j') | no next file with comments »
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 8f331df3dd9254c75c09efd5b75a31ecf3d56d13..a654df56baba17c3c86f9af8c3c40f7c586a17b7 100644

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

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

@@ -5,6 +5,7 @@

#include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"

#include "base/bind.h"

+#include "chrome/browser/chromeos/policy/device_local_account_external_data_manager.h"

#include "chrome/browser/policy/cloud/cloud_policy_core.h"

#include "chrome/browser/policy/cloud/cloud_policy_service.h"

#include "chrome/browser/policy/policy_bundle.h"

@@ -75,6 +76,7 @@ void DeviceLocalAccountPolicyProvider::UpdateFromBroker() {

// Copy policy from the broker.

bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))

.CopyFrom(broker->core()->store()->policy_map());

+ external_data_manager_ = broker->external_data_manager();

} else {

// Wait for the refresh to finish.

return;