Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 6156001: Remove wstring from l10n_util. Part 8, the last part.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
« no previous file with comments | « chrome/browser/chromeos/login/password_changed_view.cc ('k') | chrome/browser/chromeos/login/update_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698