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