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

chrome/browser/ui/browser.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 677 matching lines @@
     return;
   }
 
   // Sets the confirmation state to NOT_PROMPTED so that if the user tries to
   // close again we'll show the warning again.
   cancel_download_confirmation_state_ = NOT_PROMPTED;
 
   // 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()) {

[sky, 2014/02/18 21:24:00]

nit: no {}

[benjhayden, 2014/02/18 22:11:34]

Done.

+    fast_unload_controller_->CancelWindowClose();
+  } else {
+    unload_controller_->CancelWindowClose();
+  }
 }
 
 Browser::DownloadClosePreventionType Browser::OkToCloseWithInProgressDownloads(
     int* num_downloads_blocking) const {
   DCHECK(num_downloads_blocking);
   *num_downloads_blocking = 0;
 
   // If we're not running a full browser process with a profile manager
   // (testing), it's ok to close the browser.
   if (!g_browser_process->profile_manager())
@@ skipping 1604 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }