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..69b61d043f34ab064e07d71e4c3cdcfe69530b5a 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 |
@@ -37,46 +37,20 @@ DownloadInProgressDialogView::DownloadInProgressDialogView( |
: app_modal_(app_modal), |
callback_(callback), |
message_box_view_(NULL) { |
- 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); |
- 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); |
- break; |
- default: |
- // This dialog should have been created within the same thread invocation |
- // as the original test that lead to us, so it should always not be ok |
- // to close. |
- NOTREACHED(); |
- } |
- cancel_button_text_ = l10n_util::GetStringUTF16( |
- IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL); |
+ // This dialog should have been created within the same thread invocation |
+ // as the original test, so it's never ok to close. |
+ DCHECK_NE(Browser::DOWNLOAD_CLOSE_OK, dialog_type); |
+ base::string16 explanation_text(l10n_util::GetPluralStringFUTF16( |
+ (dialog_type == Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN) |
+ ? IDS_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION |
+ : IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, |
+ download_count)); |
+ title_text_ = l10n_util::GetPluralStringFUTF16( |
+ IDS_DOWNLOAD_REMOVE_CONFIRM_TITLE, download_count); |
+ ok_button_text_ = l10n_util::GetPluralStringFUTF16( |
+ IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL, download_count); |
+ 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)); |