| 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 "ash/system/chromeos/network/network_state_notifier.h" | 5 #include "ash/system/chromeos/network/network_state_notifier.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/chromeos/network/network_observer.h" | 8 #include "ash/system/chromeos/network/network_observer.h" |
| 9 #include "ash/system/tray/system_tray_notifier.h" | 9 #include "ash/system/tray/system_tray_notifier.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 IDS_CHROMEOS_NETWORK_ERROR_DNS_LOOKUP_FAILED); | 73 IDS_CHROMEOS_NETWORK_ERROR_DNS_LOOKUP_FAILED); |
| 74 } | 74 } |
| 75 if (error == flimflam::kErrorHTTPGetFailed) { | 75 if (error == flimflam::kErrorHTTPGetFailed) { |
| 76 return l10n_util::GetStringUTF16( | 76 return l10n_util::GetStringUTF16( |
| 77 IDS_CHROMEOS_NETWORK_ERROR_HTTP_GET_FAILED); | 77 IDS_CHROMEOS_NETWORK_ERROR_HTTP_GET_FAILED); |
| 78 } | 78 } |
| 79 if (error == flimflam::kErrorIpsecPskAuthFailed) { | 79 if (error == flimflam::kErrorIpsecPskAuthFailed) { |
| 80 return l10n_util::GetStringUTF16( | 80 return l10n_util::GetStringUTF16( |
| 81 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_PSK_AUTH_FAILED); | 81 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_PSK_AUTH_FAILED); |
| 82 } | 82 } |
| 83 if (error == flimflam::kErrorIpsecCertAuthFailed) { | 83 if (error == flimflam::kErrorIpsecCertAuthFailed || |
| 84 error == shill::kErrorEapAuthenticationFailed) { |
| 84 return l10n_util::GetStringUTF16( | 85 return l10n_util::GetStringUTF16( |
| 85 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_CERT_AUTH_FAILED); | 86 IDS_CHROMEOS_NETWORK_ERROR_CERT_AUTH_FAILED); |
| 87 } |
| 88 if (error == shill::kErrorEapLocalTlsFailed) { |
| 89 return l10n_util::GetStringUTF16( |
| 90 IDS_CHROMEOS_NETWORK_ERROR_EAP_LOCAL_TLS_FAILED); |
| 91 } |
| 92 if (error == shill::kErrorEapRemoteTlsFailed) { |
| 93 return l10n_util::GetStringUTF16( |
| 94 IDS_CHROMEOS_NETWORK_ERROR_EAP_REMOTE_TLS_FAILED); |
| 86 } | 95 } |
| 87 if (error == flimflam::kErrorPppAuthFailed) { | 96 if (error == flimflam::kErrorPppAuthFailed) { |
| 88 return l10n_util::GetStringUTF16( | 97 return l10n_util::GetStringUTF16( |
| 89 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); | 98 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); |
| 90 } | 99 } |
| 100 |
| 91 if (StringToLowerASCII(error) == | 101 if (StringToLowerASCII(error) == |
| 92 StringToLowerASCII(std::string(flimflam::kUnknownString))) { | 102 StringToLowerASCII(std::string(flimflam::kUnknownString))) { |
| 93 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); | 103 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); |
| 94 } | 104 } |
| 95 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, | 105 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, |
| 96 UTF8ToUTF16(error)); | 106 UTF8ToUTF16(error)); |
| 97 } | 107 } |
| 98 | 108 |
| 99 } // namespace | 109 } // namespace |
| 100 | 110 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 VLOG(2) << " Network: " << network->path(); | 256 VLOG(2) << " Network: " << network->path(); |
| 247 cached_state_[network->path()] = network->connection_state(); | 257 cached_state_[network->path()] = network->connection_state(); |
| 248 } | 258 } |
| 249 const NetworkState* default_network = | 259 const NetworkState* default_network = |
| 250 NetworkHandler::Get()->network_state_handler()->DefaultNetwork(); | 260 NetworkHandler::Get()->network_state_handler()->DefaultNetwork(); |
| 251 if (default_network && default_network->IsConnectedState()) | 261 if (default_network && default_network->IsConnectedState()) |
| 252 last_active_network_ = default_network->path(); | 262 last_active_network_ = default_network->path(); |
| 253 } | 263 } |
| 254 | 264 |
| 255 } // namespace ash | 265 } // namespace ash |
| OLD | NEW |