| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromeos/network/policy_applicator.h" | 5 #include "chromeos/network/policy_applicator.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 // remaining policies, new configurations have to be created. | 331 // remaining policies, new configurations have to be created. |
| 332 for (std::set<std::string>::iterator it = remaining_policies_.begin(); | 332 for (std::set<std::string>::iterator it = remaining_policies_.begin(); |
| 333 it != remaining_policies_.end(); ++it) { | 333 it != remaining_policies_.end(); ++it) { |
| 334 const base::DictionaryValue* policy = GetByGUID(all_policies_, *it); | 334 const base::DictionaryValue* policy = GetByGUID(all_policies_, *it); |
| 335 DCHECK(policy); | 335 DCHECK(policy); |
| 336 | 336 |
| 337 VLOG(1) << "Creating new configuration managed by policy " << *it | 337 VLOG(1) << "Creating new configuration managed by policy " << *it |
| 338 << " in profile " << profile_.ToDebugString() << "."; | 338 << " in profile " << profile_.ToDebugString() << "."; |
| 339 | 339 |
| 340 scoped_ptr<base::DictionaryValue> shill_dictionary = | 340 scoped_ptr<base::DictionaryValue> shill_dictionary = |
| 341 policy_util::CreateShillConfiguration(profile_, *it, policy, NULL); | 341 policy_util::CreateShillConfiguration( |
| 342 profile_, *it, policy, NULL /* no user settings */); |
| 342 WriteNewShillConfiguration(*shill_dictionary, *policy, false); | 343 WriteNewShillConfiguration(*shill_dictionary, *policy, false); |
| 343 } | 344 } |
| 344 } | 345 } |
| 345 | 346 |
| 346 } // namespace chromeos | 347 } // namespace chromeos |
| OLD | NEW |