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

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: Rebased. Created 7 years, 7 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/policy/network_configuration_updater_impl.h ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 56a03d735eea8fc50e6b89528e42e89e113898df..bf7c7adae6fe245f88034f5f64daf2ec37ad4353 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc
@@ -50,6 +50,7 @@ void NetworkConfigurationUpdaterImpl::OnUserPolicyInitialized(
bool allow_trusted_certs_from_policy,
const std::string& hashed_username) {
VLOG(1) << "User policy initialized.";
+ hashed_username_ = hashed_username;
if (allow_trusted_certs_from_policy)
SetAllowTrustedCertsFromPolicy();
ApplyNetworkConfiguration(chromeos::onc::ONC_SOURCE_USER_POLICY);
@@ -93,7 +94,9 @@ void NetworkConfigurationUpdaterImpl::ApplyNetworkConfiguration(
ParseAndValidateOncForImport(
onc_blob, onc_source, "", &network_configs, &certificates);
- network_config_handler_->SetPolicy(onc_source, network_configs);
+ std::string userhash = onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY ?
+ hashed_username_ : std::string();
+ 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/policy/network_configuration_updater_impl.h ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698