Chromium Code Reviews| Index: ash/system/chromeos/network/network_state_notifier.cc |
| diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc |
| index 022c7c69ea17e1bc0b8bbd16d5ab63ede640e4c3..ba42c9038f68c73be134af6502533f56e409594f 100644 |
| --- a/ash/system/chromeos/network/network_state_notifier.cc |
| +++ b/ash/system/chromeos/network/network_state_notifier.cc |
| @@ -10,6 +10,7 @@ |
| #include "ash/system/tray/system_tray_notifier.h" |
| #include "base/command_line.h" |
| #include "base/string16.h" |
| +#include "base/string_util.h" |
| #include "base/utf_string_conversions.h" |
| #include "chromeos/network/network_event_log.h" |
| #include "chromeos/network/network_state.h" |
| @@ -95,9 +96,12 @@ string16 GetErrorString(const std::string& error) { |
| return l10n_util::GetStringUTF16( |
| IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); |
| } |
| - if (error == flimflam::kUnknownString) |
| + if (StringToLowerASCII(error) == |
| + StringToLowerASCII(std::string(flimflam::kUnknownString))) { |
|
stevenjb
2013/03/22 23:21:06
Shill uses both UNKNOWN and Unknown, so do a case
|
| return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); |
| - return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_STATE_UNRECOGNIZED); |
| + } |
| + return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, |
| + UTF8ToUTF16(error)); |
|
stevenjb
2013/03/22 23:21:06
In the case of an actual unrecognized error (shoul
|
| } |
| } // namespace |