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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 11415148: Adding error handling to ONC validation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@extract_onc_certificate
Patch Set: Initial patch. Created 8 years, 1 month 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 1dbe6dec155dabb4d4b417d4f4039fe9d094d6ef..66eb372518c5daa622e8768e64d3aa64fb680ca7 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1487,20 +1487,26 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
NOTREACHED();
}
- std::string error;
+ std::string messages;
chromeos::NetworkLibrary* cros_network =
chromeos::CrosLibrary::Get()->GetNetworkLibrary();
- cros_network->LoadOncNetworks(onc_blob, passcode,
- chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT,
- false, // allow_web_trust_from_policy
- &error);
+ bool success = cros_network->LoadOncNetworks(
+ onc_blob, passcode,
+ chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT,
+ false, // allow_web_trust_from_policy
+ &messages);
+
+ LOG(WARNING) << "LoadOncNetworks result: " << (success ? "true":"false")
+ << ", " << messages;
// Now that we've added the networks, we need to rescan them so they'll be
// available from the menu more immediately.
cros_network->RequestNetworkScan();
- SendJavascriptCommand("receivedONCFileParse",
- Value::CreateStringValue(error));
+ base::DictionaryValue *params = new base::DictionaryValue();
+ params->Set("message", base::Value::CreateStringValue(messages));
+ params->Set("success", base::Value::CreateBooleanValue(success));
+ SendJavascriptCommand("receivedONCFileParse", params);
}
void NetInternalsMessageHandler::OnStoreDebugLogs(const ListValue* list) {

Powered by Google App Engine
This is Rietveld 408576698