chrome/browser/ui/webui/net_internals/net_internals_ui.cc - Issue 11578005: Rejecting networks/certificates independently on ONC import and policy loading.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11578005: Rejecting networks/certificates independently on ONC import and policy loading. (Closed) Base URL: http://git.chromium.org/chromium/src.git@reject_network_independently

Patch Set: Addressed Steven's comment. Created 8 years 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 c0e832db85ab0d94853413a8c869e055dd201e68..2af5d8c51472e25afe81afd58f7b92dec25a071f 100644

--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc

+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc

@@ -1495,8 +1495,8 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {

if (!cros_network->LoadOncNetworks(onc_blob, passcode,

chromeos::onc::ONC_SOURCE_USER_IMPORT,

false)) { // allow web trust from policy

- LOG(ERROR) << "Unable to load ONC.";

- error = "Unable to load ONC configuration.";

+ error = "Errors occurred during the ONC import.";

+ LOG(ERROR) << error;

}

// Now that we've added the networks, we need to rescan them so they'll be

« no previous file with comments | « chrome/browser/policy/network_configuration_updater.cc ('k') | chromeos/network/onc/onc_certificate_importer.cc » ('j') | no next file with comments »