| 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 47045a85fdee48ef0e47a024b91a5ee22125ad81..26e0a5d030899673b4b335a07cdd8bf5810ba5f1 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;
|
|
|