Index: chrome/browser/chromeos/login/screen_locker.cc |
=================================================================== |
--- chrome/browser/chromeos/login/screen_locker.cc (revision 70736) |
+++ chrome/browser/chromeos/login/screen_locker.cc (working copy) |
@@ -759,17 +759,18 @@ |
// Don't enable signout button here as we're showing |
// MessageBubble. |
- std::wstring msg = l10n_util::GetString(IDS_LOGIN_ERROR_AUTHENTICATING); |
+ string16 msg = l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_AUTHENTICATING); |
const std::string error_text = error.GetErrorString(); |
if (!error_text.empty()) |
- msg += L"\n" + ASCIIToWide(error_text); |
+ msg += ASCIIToUTF16("\n") + ASCIIToUTF16(error_text); |
InputMethodLibrary* input_method_library = |
CrosLibrary::Get()->GetInputMethodLibrary(); |
if (input_method_library->GetNumActiveInputMethods() > 1) |
- msg += L"\n" + l10n_util::GetString(IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT); |
+ msg += ASCIIToUTF16("\n") + |
+ l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT); |
- ShowErrorBubble(msg, BubbleBorder::BOTTOM_LEFT); |
+ ShowErrorBubble(UTF16ToWide(msg), BubbleBorder::BOTTOM_LEFT); |
} |
void ScreenLocker::OnLoginSuccess( |