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 e3ba82ae1102b5b2daf944b9cdba2b6c0c281b1a..120dc4fd67d7f0cdc628f8a349a2456968b83831 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 |
@@ -23,8 +23,18 @@ |
DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser) |
: browser_(browser), |
product_name_(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)) { |
- int download_count = browser->profile()->GetDownloadManager()-> |
- in_progress_count(); |
+ int download_count; |
+ Browser::DownloadClosePreventionType type = |
+ browser_->OkToCloseWithInProgressDownloads(&download_count); |
+ |
+ // 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. |
+ DCHECK(type != Browser::DOWNLOAD_CLOSE_OK); |
+ |
+ // TODO(rdsmith): This dialog should be different depending on whether we're |
+ // closing the last incognito window of a profile or doing browser shutdown. |
+ // See http://crbug.com/88421. |
std::wstring warning_text; |
std::wstring explanation_text; |