| Index: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
|
| ===================================================================
|
| --- chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc (revision 70280)
|
| +++ chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc (working copy)
|
| @@ -170,8 +170,7 @@
|
| }
|
|
|
| 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::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);
|
|
|
|
|