diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 14:42:26 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 14:42:26 +0000 |
| commit | 7571270574439e08a038275368795f03be828ae6 (patch) | |
| tree | 1c7d2e072091c7326703160ac68759e9398df348 /chrome/browser/app_controller_mac.mm | |
| parent | e8b63dc1b2d8b003d70d4031e037610588f4a473 (diff) | |
| download | chromium_src-7571270574439e08a038275368795f03be828ae6.zip chromium_src-7571270574439e08a038275368795f03be828ae6.tar.gz chromium_src-7571270574439e08a038275368795f03be828ae6.tar.bz2 | |
Use the native Mac localization bundle utility functions.
BUG=none
TEST=no change
Review URL: http://codereview.chromium.org/1791004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index c215d9c..93b8477 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -499,46 +499,38 @@ void RecordLastRunAppBundlePath() { NSString* waitTitle = nil; NSString* exitTitle = nil; - std::wstring product_name = l10n_util::GetString(IDS_PRODUCT_NAME); + string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); // Set the dialog text based on whether or not there are multiple downloads. if (downloadCount == 1) { // Dialog text: warning and explanation. - warningText = - base::SysWideToNSString(l10n_util::GetStringF( - IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING, product_name)); - explanationText = - base::SysWideToNSString(l10n_util::GetStringF( - IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, product_name)); + warningText = l10n_util::GetNSStringF( + IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING, product_name); + explanationText = l10n_util::GetNSStringF( + IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, product_name); // Cancel download and exit button text. - exitTitle = - base::SysWideToNSString(l10n_util::GetString( - IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL)); + exitTitle = l10n_util::GetNSString( + IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL); // Wait for download button text. - waitTitle = - base::SysWideToNSString(l10n_util::GetString( - IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL)); + waitTitle = l10n_util::GetNSString( + IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL); } else { // Dialog text: warning and explanation. - warningText = - base::SysWideToNSString(l10n_util::GetStringF( - IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING, product_name, - IntToWString(downloadCount))); - explanationText = - base::SysWideToNSString(l10n_util::GetStringF( - IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION, product_name)); + warningText = l10n_util::GetNSStringF( + IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING, product_name, + IntToString16(downloadCount)); + explanationText = l10n_util::GetNSStringF( + IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION, product_name); // Cancel downloads and exit button text. - exitTitle = - base::SysWideToNSString(l10n_util::GetString( - IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL)); + exitTitle = l10n_util::GetNSString( + IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL); // Wait for downloads button text. - waitTitle = - base::SysWideToNSString(l10n_util::GetString( - IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL)); + waitTitle = l10n_util::GetNSString( + IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL); } // 'waitButton' is the default choice. |