| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 LOG(WARNING) << "Handler destructed during policy application to profile " | 105 LOG(WARNING) << "Handler destructed during policy application to profile " |
| 106 << profile_.ToDebugString(); | 106 << profile_.ToDebugString(); |
| 107 return; | 107 return; |
| 108 } | 108 } |
| 109 | 109 |
| 110 VLOG(2) << "Received properties for entry " << entry << " of profile " | 110 VLOG(2) << "Received properties for entry " << entry << " of profile " |
| 111 << profile_.ToDebugString(); | 111 << profile_.ToDebugString(); |
| 112 | 112 |
| 113 scoped_ptr<base::DictionaryValue> onc_part( | 113 scoped_ptr<base::DictionaryValue> onc_part( |
| 114 onc::TranslateShillServiceToONCPart(entry_properties, | 114 onc::TranslateShillServiceToONCPart(entry_properties, |
| 115 ::onc::ONC_SOURCE_UNKNOWN, |
| 115 &onc::kNetworkWithStateSignature)); | 116 &onc::kNetworkWithStateSignature)); |
| 116 | 117 |
| 117 std::string old_guid; | 118 std::string old_guid; |
| 118 if (!onc_part->GetStringWithoutPathExpansion(::onc::network_config::kGUID, | 119 if (!onc_part->GetStringWithoutPathExpansion(::onc::network_config::kGUID, |
| 119 &old_guid)) { | 120 &old_guid)) { |
| 120 VLOG(1) << "Entry " << entry << " of profile " << profile_.ToDebugString() | 121 VLOG(1) << "Entry " << entry << " of profile " << profile_.ToDebugString() |
| 121 << " doesn't contain a GUID."; | 122 << " doesn't contain a GUID."; |
| 122 // This might be an entry of an older ChromeOS version. Assume it to be | 123 // This might be an entry of an older ChromeOS version. Assume it to be |
| 123 // unmanaged. | 124 // unmanaged. |
| 124 } | 125 } |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 *it, | 316 *it, |
| 316 &global_network_config_, | 317 &global_network_config_, |
| 317 network_policy, | 318 network_policy, |
| 318 NULL /* no user settings */); | 319 NULL /* no user settings */); |
| 319 WriteNewShillConfiguration( | 320 WriteNewShillConfiguration( |
| 320 *shill_dictionary, *network_policy, false /* write now */); | 321 *shill_dictionary, *network_policy, false /* write now */); |
| 321 } | 322 } |
| 322 } | 323 } |
| 323 | 324 |
| 324 } // namespace chromeos | 325 } // namespace chromeos |
| OLD | NEW |