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

Unified Diff: chromeos/network/onc/onc_utils.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 | « chromeos/network/onc/onc_utils.h ('k') | chromeos/network/onc/onc_validator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_utils.cc
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 75d9e5217768efae09895a77abd75be78bccf628..586907d1c1a6cfd1b9ad8797b5217e8c2027d3a2 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -350,9 +350,11 @@ bool ParseAndValidateOncForImport(const std::string& onc_blob,
ONCSource onc_source,
const std::string& passphrase,
base::ListValue* network_configs,
+ base::DictionaryValue* global_network_config,
base::ListValue* certificates) {
- certificates->Clear();
network_configs->Clear();
+ global_network_config->Clear();
+ certificates->Clear();
if (onc_blob.empty())
return true;
@@ -433,6 +435,13 @@ bool ParseAndValidateOncForImport(const std::string& onc_blob,
network_configs->Swap(validated_networks);
}
+ base::DictionaryValue* validated_global_config = NULL;
+ if (toplevel_onc->GetDictionaryWithoutPathExpansion(
+ toplevel_config::kGlobalNetworkConfiguration,
+ &validated_global_config)) {
+ global_network_config->Swap(validated_global_config);
+ }
+
return success;
}
« no previous file with comments | « chromeos/network/onc/onc_utils.h ('k') | chromeos/network/onc/onc_validator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698