| Index: chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
|
| diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
|
| index 13a1da9e36f14f5b1d86598d66707eb1b81e8033..9ec9adab4c0c806a11ee5ad96c7488b3c301cab8 100644
|
| --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
|
| +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
|
| @@ -40,34 +40,21 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(
|
| base::string16 explanation_text;
|
| switch (dialog_type) {
|
| case Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN:
|
| - if (download_count == 1) {
|
| - title_text_ = l10n_util::GetStringUTF16(
|
| - IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE);
|
| - explanation_text = l10n_util::GetStringUTF16(
|
| - IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
|
| - } else {
|
| - title_text_ = l10n_util::GetStringUTF16(
|
| - IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE);
|
| - explanation_text = l10n_util::GetStringUTF16(
|
| - IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
|
| - }
|
| - ok_button_text_ = l10n_util::GetStringUTF16(
|
| - IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
|
| + title_text_ = l10n_util::GetPluralStringFUTF16(
|
| + IDS_DOWNLOAD_REMOVE_CONFIRM_TITLE, download_count);
|
| + explanation_text = l10n_util::GetPluralStringFUTF16(
|
| + IDS_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, download_count);
|
| + ok_button_text_ = l10n_util::GetPluralStringFUTF16(
|
| + IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL, download_count);
|
| break;
|
| case Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE:
|
| - if (download_count == 1) {
|
| - title_text_ = l10n_util::GetStringUTF16(
|
| - IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE);
|
| - explanation_text = l10n_util::GetStringUTF16(
|
| - IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
|
| - } else {
|
| - title_text_ = l10n_util::GetStringUTF16(
|
| - IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_TITLE);
|
| - explanation_text = l10n_util::GetStringUTF16(
|
| - IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
|
| - }
|
| - ok_button_text_ = l10n_util::GetStringUTF16(
|
| - IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
|
| + title_text_ = l10n_util::GetPluralStringFUTF16(
|
| + IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE, download_count);
|
| + explanation_text = l10n_util::GetPluralStringFUTF16(
|
| + IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, download_count);
|
| + ok_button_text_ = l10n_util::GetPluralStringFUTF16(
|
| + IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL,
|
| + download_count);
|
| break;
|
| default:
|
| // This dialog should have been created within the same thread invocation
|
| @@ -75,8 +62,8 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(
|
| // to close.
|
| NOTREACHED();
|
| }
|
| - cancel_button_text_ = l10n_util::GetStringUTF16(
|
| - IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
|
| + cancel_button_text_ = l10n_util::GetPluralStringFUTF16(
|
| + IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL, download_count);
|
|
|
| message_box_view_ = new views::MessageBoxView(
|
| views::MessageBoxView::InitParams(explanation_text));
|
|
|