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

Unified Diff: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc

Issue 5989012: Revert 70281 - 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/plugin_exceptions_table_model.cc ('k') | chrome/browser/remoting/remoting_setup_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
===================================================================
--- chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc (revision 70282)
+++ chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc (working copy)
@@ -170,7 +170,8 @@
}
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::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);
« no previous file with comments | « chrome/browser/plugin_exceptions_table_model.cc ('k') | chrome/browser/remoting/remoting_setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698