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

Unified Diff: chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.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 | « no previous file | chrome/browser/chromeos/policy/network_configuration_updater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
index 71796220df704b256279e2e38cbd1ca70a22a3cf..58f600c1eb3be62ea62f1ee285f0b970dc29cc28 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
@@ -105,9 +105,16 @@ void NetworkConfigurationPolicyHandler::ApplyPolicySettings(
scoped_ptr<base::ListValue> network_configs(new base::ListValue);
base::ListValue certificates;
- chromeos::onc::ParseAndValidateOncForImport(
- onc_blob, onc_source_, "", network_configs.get(), &certificates);
-
+ base::DictionaryValue global_network_config;
+ chromeos::onc::ParseAndValidateOncForImport(onc_blob,
+ onc_source_,
+ "",
+ network_configs.get(),
+ &global_network_config,
+ &certificates);
+
+ // Currently, only the per-network configuration is stored in a pref. Ignore
+ // |global_network_config| and |certificates|.
prefs->SetValue(pref_path_, network_configs.release());
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/network_configuration_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698