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/ui/app_modal_dialogs | |
| 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/ui/app_modal_dialogs')
| -rw-r--r-- | chrome/browser/ui/app_modal_dialogs/message_box_handler.cc | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc index a486abb..bdf7d42 100644 --- a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc +++ b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc @@ -33,15 +33,15 @@ static std::wstring GetTitle(Profile* profile, extension = extensions_service->GetExtensionByWebExtent(frame_url); if (extension && (extension->location() == Extension::COMPONENT)) { - return l10n_util::GetString(IDS_PRODUCT_NAME); + return UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); } else if (extension && !extension->name().empty()) { return UTF8ToWide(extension->name()); } } if (!frame_url.has_host()) { - return l10n_util::GetString( + return UTF16ToWideHack(l10n_util::GetStringUTF16( is_alert ? IDS_JAVASCRIPT_ALERT_DEFAULT_TITLE - : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE); + : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE)); } // TODO(brettw) it should be easier than this to do the correct language @@ -78,11 +78,16 @@ void RunJavascriptMessageBox(Profile* profile, void RunBeforeUnloadDialog(TabContents* tab_contents, const std::wstring& message_text, IPC::Message* reply_msg) { - std::wstring full_message = - message_text + L"\n\n" + - l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER); + std::wstring full_message = message_text + L"\n\n" + UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER)); AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog( - tab_contents, l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE), - MessageBoxFlags::kIsJavascriptConfirm, message_text, std::wstring(), - false, true, reply_msg)); + tab_contents, + UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE)), + MessageBoxFlags::kIsJavascriptConfirm, + message_text, + std::wstring(), + false, + true, + reply_msg)); } |