| 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.h" | 5 #include "chromeos/network/network_device_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chromeos/dbus/dbus_thread_manager.h" | 9 #include "chromeos/dbus/dbus_thread_manager.h" |
| 10 #include "chromeos/dbus/shill_device_client.h" | 10 #include "chromeos/dbus/shill_device_client.h" |
| 11 #include "chromeos/dbus/shill_ipconfig_client.h" | 11 #include "chromeos/dbus/shill_ipconfig_client.h" |
| 12 #include "chromeos/network/device_state.h" | 12 #include "chromeos/network/device_state.h" |
| 13 #include "chromeos/network/network_event_log.h" | 13 #include "chromeos/network/network_event_log.h" |
| 14 #include "dbus/object_path.h" | 14 #include "dbus/object_path.h" |
| 15 #include "third_party/cros_system_api/dbus/service_constants.h" | 15 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 16 | 16 |
| 17 namespace chromeos { | 17 namespace chromeos { |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 const char kDevicePath[] = "devicePath"; | |
| 22 | |
| 23 // TODO(armansito): Add bindings for these to service_constants.h | 21 // TODO(armansito): Add bindings for these to service_constants.h |
| 24 // (crbug.com/256889) | 22 // (crbug.com/256889) |
| 25 const char kShillErrorFailure[] = "org.chromium.flimflam.Error.Failure"; | 23 const char kShillErrorFailure[] = "org.chromium.flimflam.Error.Failure"; |
| 26 const char kShillErrorNotSupported[] = | 24 const char kShillErrorNotSupported[] = |
| 27 "org.chromium.flimflam.Error.NotSupported"; | 25 "org.chromium.flimflam.Error.NotSupported"; |
| 28 | 26 |
| 29 std::string GetErrorNameForShillError(const std::string& shill_error_name) { | 27 std::string GetErrorNameForShillError(const std::string& shill_error_name) { |
| 30 // TODO(armansito): Use the new SIM error names once the ones below get | 28 // TODO(armansito): Use the new SIM error names once the ones below get |
| 31 // deprecated (crbug.com/256855) | 29 // deprecated (crbug.com/256855) |
| 32 if (shill_error_name == kShillErrorFailure) | 30 if (shill_error_name == kShillErrorFailure) |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 void NetworkDeviceHandler::HandleShillCallFailureForTest( | 257 void NetworkDeviceHandler::HandleShillCallFailureForTest( |
| 260 const std::string& device_path, | 258 const std::string& device_path, |
| 261 const network_handler::ErrorCallback& error_callback, | 259 const network_handler::ErrorCallback& error_callback, |
| 262 const std::string& shill_error_name, | 260 const std::string& shill_error_name, |
| 263 const std::string& shill_error_message) { | 261 const std::string& shill_error_message) { |
| 264 HandleShillCallFailure( | 262 HandleShillCallFailure( |
| 265 device_path, error_callback, shill_error_name, shill_error_message); | 263 device_path, error_callback, shill_error_name, shill_error_message); |
| 266 } | 264 } |
| 267 | 265 |
| 268 } // namespace chromeos | 266 } // namespace chromeos |
| OLD | NEW |