Reset UnloadController::is_attempting_to_close_browser_ when the download-in-progress prompt is can…

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 70062efbe7e8caf79e59ac89041c9b57ae5434fe..e047c1605599eb462c541daebe2f318811cfeb29 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -695,6 +695,13 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) {
   // Show the download page so the user can figure-out what downloads are still
   // in-progress.
   chrome::ShowDownloads(this);
+
+  // Reset UnloadController::is_attempting_to_close_browser_ so that we don't
+  // prompt every time any tab is closed. http://crbug.com/305516
+  if (IsFastTabUnloadEnabled())
+    fast_unload_controller_->CancelWindowClose();
+  else
+    unload_controller_->CancelWindowClose();
 }
 
 Browser::DownloadClosePreventionType Browser::OkToCloseWithInProgressDownloads(