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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/login/login_prompt.cc

Issue 6051012: Revert 70271 - Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/message_box_handler.cc ('k') | chrome/browser/ui/toolbar/toolbar_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/login/login_prompt.cc
===================================================================
--- chrome/browser/ui/login/login_prompt.cc (revision 70280)
+++ chrome/browser/ui/login/login_prompt.cc (working copy)
@@ -385,16 +385,14 @@
password_manager->PasswordFormsFound(v);
handler_->SetPasswordManager(password_manager);
- string16 host_and_port_hack16 = WideToUTF16Hack(auth_info_->host_and_port);
- string16 realm_hack16 = WideToUTF16Hack(auth_info_->realm);
- string16 explanation = realm_hack16.empty() ?
- l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
- host_and_port_hack16) :
- l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION,
- host_and_port_hack16,
- realm_hack16);
+ std::wstring explanation = auth_info_->realm.empty() ?
+ l10n_util::GetStringF(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
+ auth_info_->host_and_port) :
+ l10n_util::GetStringF(IDS_LOGIN_DIALOG_DESCRIPTION,
+ auth_info_->host_and_port,
+ auth_info_->realm);
handler_->BuildViewForPasswordManager(password_manager,
- UTF16ToWideHack(explanation));
+ explanation);
}
private:
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/message_box_handler.cc ('k') | chrome/browser/ui/toolbar/toolbar_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698