| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/network_configuration_handler.h" | 5 #include "chromeos/network/network_configuration_handler.h" |
| 6 | 6 |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
| 10 #include "base/guid.h" | 10 #include "base/guid.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 error_callback, dbus_error_name, dbus_error_message); | 58 error_callback, dbus_error_name, dbus_error_message); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void LogConfigProperties(const std::string& desc, | 61 void LogConfigProperties(const std::string& desc, |
| 62 const std::string& path, | 62 const std::string& path, |
| 63 const base::DictionaryValue& properties) { | 63 const base::DictionaryValue& properties) { |
| 64 for (base::DictionaryValue::Iterator iter(properties); !iter.IsAtEnd(); | 64 for (base::DictionaryValue::Iterator iter(properties); !iter.IsAtEnd(); |
| 65 iter.Advance()) { | 65 iter.Advance()) { |
| 66 std::string v = "******"; | 66 std::string v = "******"; |
| 67 if (shill_property_util::IsLoggableShillProperty(iter.key())) | 67 if (shill_property_util::IsLoggableShillProperty(iter.key())) |
| 68 base::JSONWriter::Write(&iter.value(), &v); | 68 base::JSONWriter::Write(iter.value(), &v); |
| 69 NET_LOG(USER) << desc << ": " << path + "." + iter.key() + "=" + v; | 69 NET_LOG(USER) << desc << ": " << path + "." + iter.key() + "=" + v; |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 } // namespace | 73 } // namespace |
| 74 | 74 |
| 75 // Helper class to request from Shill the profile entries associated with a | 75 // Helper class to request from Shill the profile entries associated with a |
| 76 // Service and delete the service from each profile. Triggers either | 76 // Service and delete the service from each profile. Triggers either |
| 77 // |callback| on success or |error_callback| on failure, and calls | 77 // |callback| on success or |error_callback| on failure, and calls |
| 78 // |handler|->ProfileEntryDeleterCompleted() on completion to delete itself. | 78 // |handler|->ProfileEntryDeleterCompleted() on completion to delete itself. |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 // static | 555 // static |
| 556 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest( | 556 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest( |
| 557 NetworkStateHandler* network_state_handler, | 557 NetworkStateHandler* network_state_handler, |
| 558 NetworkDeviceHandler* network_device_handler) { | 558 NetworkDeviceHandler* network_device_handler) { |
| 559 NetworkConfigurationHandler* handler = new NetworkConfigurationHandler(); | 559 NetworkConfigurationHandler* handler = new NetworkConfigurationHandler(); |
| 560 handler->Init(network_state_handler, network_device_handler); | 560 handler->Init(network_state_handler, network_device_handler); |
| 561 return handler; | 561 return handler; |
| 562 } | 562 } |
| 563 | 563 |
| 564 } // namespace chromeos | 564 } // namespace chromeos |
| OLD | NEW |