| 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 #include <string> | |
| 8 #include <vector> | |
| 9 | 7 |
| 10 #include "base/bind.h" | 8 #include "base/bind.h" |
| 11 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
| 12 #include "base/guid.h" | 10 #include "base/guid.h" |
| 13 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
| 14 #include "base/logging.h" | 12 #include "base/logging.h" |
| 15 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
| 16 #include "base/memory/scoped_ptr.h" | |
| 17 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 18 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 19 #include "base/values.h" | 16 #include "base/values.h" |
| 20 #include "chromeos/dbus/dbus_thread_manager.h" | 17 #include "chromeos/dbus/dbus_thread_manager.h" |
| 21 #include "chromeos/dbus/shill_manager_client.h" | 18 #include "chromeos/dbus/shill_manager_client.h" |
| 22 #include "chromeos/dbus/shill_profile_client.h" | 19 #include "chromeos/dbus/shill_profile_client.h" |
| 23 #include "chromeos/dbus/shill_service_client.h" | 20 #include "chromeos/dbus/shill_service_client.h" |
| 24 #include "chromeos/network/network_device_handler.h" | 21 #include "chromeos/network/network_device_handler.h" |
| 25 #include "chromeos/network/network_state.h" | 22 #include "chromeos/network/network_state.h" |
| 26 #include "chromeos/network/network_state_handler.h" | 23 #include "chromeos/network/network_state_handler.h" |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 // static | 555 // static |
| 559 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest( | 556 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest( |
| 560 NetworkStateHandler* network_state_handler, | 557 NetworkStateHandler* network_state_handler, |
| 561 NetworkDeviceHandler* network_device_handler) { | 558 NetworkDeviceHandler* network_device_handler) { |
| 562 NetworkConfigurationHandler* handler = new NetworkConfigurationHandler(); | 559 NetworkConfigurationHandler* handler = new NetworkConfigurationHandler(); |
| 563 handler->Init(network_state_handler, network_device_handler); | 560 handler->Init(network_state_handler, network_device_handler); |
| 564 return handler; | 561 return handler; |
| 565 } | 562 } |
| 566 | 563 |
| 567 } // namespace chromeos | 564 } // namespace chromeos |
| OLD | NEW |