diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:10:13 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:10:13 +0000 |
| commit | 1308ac961fdd5148ce95e228fe192175584a5464 (patch) | |
| tree | 08f1e60a5b15a97aca4b24d1dd4e92e0dd1dc6ca /chrome/browser/ui/login | |
| parent | d546c48d90f0eaa592794f59e6a970b7b027db86 (diff) | |
| download | chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.zip chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.tar.gz chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.tar.bz2 | |
Revert 70271 - Remove wstring from l10n_util. Part 3.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044006
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6051012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/login')
| -rw-r--r-- | chrome/browser/ui/login/login_prompt.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 40cc66a..d653457 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -385,16 +385,14 @@ class LoginDialogTask : public Task { 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: |