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/printing | |
| 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/printing')
| -rw-r--r-- | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index d34d939..fddff26 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -170,8 +170,7 @@ void CloudPrintSetupFlow::OnCloseContents(TabContents* source, } std::wstring CloudPrintSetupFlow::GetDialogTitle() const { - return UTF16ToWideHack( - l10n_util::GetStringUTF16(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE)); + return l10n_util::GetString(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE); } bool CloudPrintSetupFlow::IsDialogModal() const { @@ -271,11 +270,10 @@ void CloudPrintSetupFlow::ShowGaiaFailed(const GoogleServiceAuthError& error) { void CloudPrintSetupFlow::ShowSetupDone() { setup_done_ = true; - string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); - std::wstring message = - UTF16ToWideHack(l10n_util::GetStringFUTF16(IDS_CLOUD_PRINT_SETUP_DONE, - product_name, - UTF8ToUTF16(login_))); + std::wstring product_name = l10n_util::GetString(IDS_PRODUCT_NAME); + std::wstring message = l10n_util::GetStringF(IDS_CLOUD_PRINT_SETUP_DONE, + product_name, + UTF8ToWide(login_)); std::wstring javascript = L"cloudprint.setMessage('" + message + L"');"; ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript); |