diff options
| author | limasdf <limasdf@gmail.com> | 2015-11-24 17:10:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-25 01:11:47 +0000 |
| commit | ba1b9cf98c3653adf2773d3df38465a8ee1d2016 (patch) | |
| tree | 88057a8684de4f19ccb825a1aaf099dcffd44a52 /chromeos/network | |
| parent | 0db5a66a92784c47e52c783a17cbd5072e78b647 (diff) | |
| download | chromium_src-ba1b9cf98c3653adf2773d3df38465a8ee1d2016.zip chromium_src-ba1b9cf98c3653adf2773d3df38465a8ee1d2016.tar.gz chromium_src-ba1b9cf98c3653adf2773d3df38465a8ee1d2016.tar.bz2 | |
Play better with C++11 library features from /chromeos
- Get rid of ScopedPtrMap
- Get rid of linked_ptr
- Replace Pass() with std::move()
BUG=554291, 557422, 556939
TBR=cschuet@chromium.org
Review URL: https://codereview.chromium.org/1454773002
Cr-Commit-Position: refs/heads/master@{#361509}
Diffstat (limited to 'chromeos/network')
| -rw-r--r-- | chromeos/network/managed_network_configuration_handler_impl.cc | 4 | ||||
| -rw-r--r-- | chromeos/network/managed_network_configuration_handler_impl.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc index 16648c3..8e1c910 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; } diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h index 23a8f72..9cf30ef 100644 --- a/chromeos/network/managed_network_configuration_handler_impl.h +++ b/chromeos/network/managed_network_configuration_handler_impl.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/memory/linked_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/managed_network_configuration_handler.h" @@ -118,8 +118,8 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl typedef base::Callback<void(const std::string& service_path, scoped_ptr<base::DictionaryValue> properties)> GetDevicePropertiesCallback; - typedef std::map<std::string, linked_ptr<Policies> > UserToPoliciesMap; - typedef std::map<std::string, linked_ptr<PolicyApplicator>> + typedef std::map<std::string, scoped_ptr<Policies>> UserToPoliciesMap; + typedef std::map<std::string, scoped_ptr<PolicyApplicator>> UserToPolicyApplicatorMap; typedef std::map<std::string, std::set<std::string>> UserToModifiedPoliciesMap; |