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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.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/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 3f55e34ad401461b99d7ea25d8c1ddd40cdb91b5..cee252a6538be274936eeabe6bcf2ce3c2a6684c 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1552,9 +1552,14 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
onc::ONCSource onc_source = onc::ONC_SOURCE_USER_IMPORT;
base::ListValue network_configs;
+ base::DictionaryValue global_network_config;
base::ListValue certificates;
- if (!chromeos::onc::ParseAndValidateOncForImport(
- onc_blob, onc_source, passcode, &network_configs, &certificates)) {
+ if (!chromeos::onc::ParseAndValidateOncForImport(onc_blob,
+ onc_source,
+ passcode,
+ &network_configs,
+ &global_network_config,
+ &certificates)) {
error = "Errors occurred during the ONC parsing. ";
}

Powered by Google App Engine
This is Rietveld 408576698