Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2984)

Unified Diff: chrome/browser/chromeos/policy/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
Index: chrome/browser/chromeos/policy/network_configuration_updater.cc
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater.cc b/chrome/browser/chromeos/policy/network_configuration_updater.cc
index d4f29c22edb758af450918a0ce9f3e32019fafe6..ae998cd9587c2a4bb8b611d9bf4e3a62dbe6e44a 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater.cc
@@ -91,9 +91,12 @@ void NetworkConfigurationUpdater::ImportCertificates(
}
void NetworkConfigurationUpdater::ApplyNetworkPolicy(
- base::ListValue* network_configs_onc) {
- network_config_handler_->SetPolicy(
- onc_source_, std::string() /* no username hash */, *network_configs_onc);
+ base::ListValue* network_configs_onc,
+ base::DictionaryValue* global_network_config) {
+ network_config_handler_->SetPolicy(onc_source_,
+ std::string() /* no username hash */,
+ *network_configs_onc,
+ *global_network_config);
}
void NetworkConfigurationUpdater::OnPolicyChanged(
@@ -115,15 +118,17 @@ void NetworkConfigurationUpdater::ApplyPolicy() {
LOG(ERROR) << LogHeader() << " is not a string value.";
base::ListValue network_configs;
+ base::DictionaryValue global_network_config;
base::ListValue certificates;
chromeos::onc::ParseAndValidateOncForImport(onc_blob,
onc_source_,
"" /* no passphrase */,
&network_configs,
+ &global_network_config,
&certificates);
ImportCertificates(certificates);
- ApplyNetworkPolicy(&network_configs);
+ ApplyNetworkPolicy(&network_configs, &global_network_config);
}
std::string NetworkConfigurationUpdater::LogHeader() const {

Powered by Google App Engine
This is Rietveld 408576698