chrome/browser/chromeos/policy/network_configuration_updater_impl.cc - Issue 13957012: Adding a NetworkProfileHandler used by ManagedNetworkConfigurationHandler.

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/chromeos/policy/network_configuration_updater_impl.cc

Issue 13957012: Adding a NetworkProfileHandler used by ManagedNetworkConfigurationHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed one comment. Created 7 years, 8 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 | « chrome/browser/chromeos/extensions/networking_private_apitest.cc ('k') | chromeos/chromeos.gyp » ('j') | chromeos/dbus/shill_profile_client_stub.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc b/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

index ea0f6192813f8c072e3e5bcc258698813befbc61..7053399db00fe853d1eb6a9e86cd3bb1c7e88b0c 100644

--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

@@ -93,7 +93,11 @@ void NetworkConfigurationUpdaterImpl::ApplyNetworkConfiguration(

ParseAndValidateOncForImport(

onc_blob, onc_source, "", &network_configs, &certificates);

- network_config_handler_->SetPolicy(onc_source, network_configs);

+ // TODO(pneubeck): fix when rebasing on Joao's commit !!!!!!!!!!!!!!!

+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

+ std::string userhash = onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY ?

+ "user1" : "";

+ network_config_handler_->SetPolicy(onc_source, userhash, network_configs);

scoped_ptr<net::CertificateList> web_trust_certs(new net::CertificateList);

certificate_handler_->ImportCertificates(

« no previous file with comments | « chrome/browser/chromeos/extensions/networking_private_apitest.cc ('k') | chromeos/chromeos.gyp » ('j') | chromeos/dbus/shill_profile_client_stub.h » ('J')