Index: chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc |
diff --git a/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc |
index 289b58521a8eb8e25436f90555bb22331089e4fe..41378f407a2b768ff8d897f6999b7db7e67d9544 100644 |
--- a/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc |
+++ b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc |
@@ -21,9 +21,18 @@ |
DownloadInProgressDialogGtk::DownloadInProgressDialogGtk(Browser* browser) |
: browser_(browser) { |
- int download_count = |
- DownloadServiceFactory::GetForProfile( |
- 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); |
achuithb
2011/10/13 23:05:08
DCHECK_NE
Randy Smith (Not in Mondays)
2011/10/14 00:37:41
Done.
|
+ |
+ // 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::string warning_text; |
std::string explanation_text; |