chrome/browser/chromeos/policy/user_network_configuration_updater.cc - Issue 23526016: Autoconnect policy for CrOS.

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/user_network_configuration_updater.cc

Issue 23526016: Autoconnect policy for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Renamed policy. Created 7 years, 2 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/user_network_configuration_updater.h ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_network_configuration_updater.cc

diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc

index 990f5bd743998b14db6b752fcc4dc676451e5325..49c2552ded99d32337fc11d173e004524e360862 100644

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

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

@@ -76,12 +76,15 @@ void UserNetworkConfigurationUpdater::ImportCertificates(

}

void UserNetworkConfigurationUpdater::ApplyNetworkPolicy(

- base::ListValue* network_configs_onc) {

+ base::ListValue* network_configs_onc,

+ base::DictionaryValue* global_network_config) {

DCHECK(user_);

chromeos::onc::ExpandStringPlaceholdersInNetworksForUser(user_,

network_configs_onc);

- network_config_handler_->SetPolicy(

- onc_source_, user_->username_hash(), *network_configs_onc);

+ network_config_handler_->SetPolicy(onc_source_,

+ user_->username_hash(),

+ *network_configs_onc,

+ *global_network_config);

}

void UserNetworkConfigurationUpdater::SetTrustAnchors() {