diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:37:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:37:45 +0000 |
| commit | d1318574ee4f31f1a8fbea9d8584c89c069af987 (patch) | |
| tree | 44914e9ea575a25c544b0ec9bc0925e7c2f3f0ea /chrome/browser/printing | |
| parent | 1308ac961fdd5148ce95e228fe192175584a5464 (diff) | |
| download | chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.zip chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.tar.gz chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.tar.bz2 | |
Revert 70281 - 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
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/5989012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70283 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, 7 insertions, 5 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 fddff26..d34d939 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -170,7 +170,8 @@ void CloudPrintSetupFlow::OnCloseContents(TabContents* source, } std::wstring CloudPrintSetupFlow::GetDialogTitle() const { - return l10n_util::GetString(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE); + return UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE)); } bool CloudPrintSetupFlow::IsDialogModal() const { @@ -270,10 +271,11 @@ void CloudPrintSetupFlow::ShowGaiaFailed(const GoogleServiceAuthError& error) { void CloudPrintSetupFlow::ShowSetupDone() { setup_done_ = true; - 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_)); + 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 javascript = L"cloudprint.setMessage('" + message + L"');"; ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript); |