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/network_device_handler_impl.h" | 5 #include "chromeos/network/network_device_handler_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 #include "chromeos/dbus/dbus_thread_manager.h" | 12 #include "chromeos/dbus/dbus_thread_manager.h" |
13 #include "chromeos/dbus/shill_device_client.h" | 13 #include "chromeos/dbus/shill_device_client.h" |
14 #include "chromeos/dbus/shill_ipconfig_client.h" | 14 #include "chromeos/dbus/shill_ipconfig_client.h" |
15 #include "chromeos/network/device_state.h" | 15 #include "chromeos/network/device_state.h" |
16 #include "chromeos/network/network_event_log.h" | 16 #include "chromeos/network/network_event_log.h" |
17 #include "chromeos/network/network_handler_callbacks.h" | 17 #include "chromeos/network/network_handler_callbacks.h" |
18 #include "chromeos/network/network_state_handler.h" | 18 #include "chromeos/network/network_state_handler.h" |
19 #include "chromeos/network/shill_property_util.h" | |
20 #include "dbus/object_path.h" | 19 #include "dbus/object_path.h" |
21 #include "third_party/cros_system_api/dbus/service_constants.h" | 20 #include "third_party/cros_system_api/dbus/service_constants.h" |
22 | 21 |
23 namespace chromeos { | 22 namespace chromeos { |
24 | 23 |
25 namespace { | 24 namespace { |
26 | 25 |
27 std::string GetErrorNameForShillError(const std::string& shill_error_name) { | 26 std::string GetErrorNameForShillError(const std::string& shill_error_name) { |
28 if (shill_error_name == shill::kErrorResultFailure) | 27 if (shill_error_name == shill::kErrorResultFailure) |
29 return NetworkDeviceHandler::kErrorFailure; | 28 return NetworkDeviceHandler::kErrorFailure; |
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 | 477 |
479 SetDevicePropertyInternal(device_state->path(), | 478 SetDevicePropertyInternal(device_state->path(), |
480 shill::kCellularAllowRoamingProperty, | 479 shill::kCellularAllowRoamingProperty, |
481 base::FundamentalValue(new_device_value), | 480 base::FundamentalValue(new_device_value), |
482 base::Bind(&base::DoNothing), | 481 base::Bind(&base::DoNothing), |
483 network_handler::ErrorCallback()); | 482 network_handler::ErrorCallback()); |
484 } | 483 } |
485 } | 484 } |
486 | 485 |
487 } // namespace chromeos | 486 } // namespace chromeos |
OLD | NEW |