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

Unified Diff: chromeos/network/managed_network_configuration_handler_impl.cc

Issue 1454773002: Play better with C++11 library features from /chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chromeos/network/managed_network_configuration_handler_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/managed_network_configuration_handler_impl.cc
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
index 16648c34163466dc23ec05aad6a12cb62a7f000a..8e1c910d3581355d49e2346764934bec4202cfb7 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.cc
+++ b/chromeos/network/managed_network_configuration_handler_impl.cc
@@ -422,7 +422,7 @@ void ManagedNetworkConfigurationHandlerImpl::SetPolicy(
policies = policies_by_user_[userhash].get();
} else {
policies = new Policies;
- policies_by_user_[userhash] = make_linked_ptr(policies);
+ policies_by_user_[userhash] = make_scoped_ptr(policies);
}
policies->global_network_config.MergeDictionary(&global_network_config);
@@ -515,7 +515,7 @@ bool ManagedNetworkConfigurationHandlerImpl::ApplyOrQueuePolicies(
policies->global_network_config,
this,
modified_policies);
- policy_applicators_[userhash] = make_linked_ptr(applicator);
+ policy_applicators_[userhash] = make_scoped_ptr(applicator);
applicator->Run();
return true;
}
« no previous file with comments | « chromeos/network/managed_network_configuration_handler_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698