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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 const base::DictionaryValue& profile_properties) { | 66 const base::DictionaryValue& profile_properties) { |
67 if (!handler_) { | 67 if (!handler_) { |
68 LOG(WARNING) << "Handler destructed during policy application to profile " | 68 LOG(WARNING) << "Handler destructed during policy application to profile " |
69 << profile_.ToDebugString(); | 69 << profile_.ToDebugString(); |
70 return; | 70 return; |
71 } | 71 } |
72 | 72 |
73 VLOG(2) << "Received properties for profile " << profile_.ToDebugString(); | 73 VLOG(2) << "Received properties for profile " << profile_.ToDebugString(); |
74 const base::ListValue* entries = NULL; | 74 const base::ListValue* entries = NULL; |
75 if (!profile_properties.GetListWithoutPathExpansion( | 75 if (!profile_properties.GetListWithoutPathExpansion( |
76 flimflam::kEntriesProperty, &entries)) { | 76 shill::kEntriesProperty, &entries)) { |
77 LOG(ERROR) << "Profile " << profile_.ToDebugString() | 77 LOG(ERROR) << "Profile " << profile_.ToDebugString() |
78 << " doesn't contain the property " | 78 << " doesn't contain the property " |
79 << flimflam::kEntriesProperty; | 79 << shill::kEntriesProperty; |
80 return; | 80 return; |
81 } | 81 } |
82 | 82 |
83 for (base::ListValue::const_iterator it = entries->begin(); | 83 for (base::ListValue::const_iterator it = entries->begin(); |
84 it != entries->end(); ++it) { | 84 it != entries->end(); ++it) { |
85 std::string entry; | 85 std::string entry; |
86 (*it)->GetAsString(&entry); | 86 (*it)->GetAsString(&entry); |
87 | 87 |
88 DBusThreadManager::Get()->GetShillProfileClient()->GetEntry( | 88 DBusThreadManager::Get()->GetShillProfileClient()->GetEntry( |
89 dbus::ObjectPath(profile_.path), | 89 dbus::ObjectPath(profile_.path), |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 | 242 |
243 VLOG(1) << "Creating new configuration managed by policy " << *it | 243 VLOG(1) << "Creating new configuration managed by policy " << *it |
244 << " in profile " << profile_.ToDebugString() << "."; | 244 << " in profile " << profile_.ToDebugString() << "."; |
245 | 245 |
246 CreateAndWriteNewShillConfiguration( | 246 CreateAndWriteNewShillConfiguration( |
247 *it, *policy, NULL /* no user settings */); | 247 *it, *policy, NULL /* no user settings */); |
248 } | 248 } |
249 } | 249 } |
250 | 250 |
251 } // namespace chromeos | 251 } // namespace chromeos |
OLD | NEW |