Fix warning prompting on closing a window that will cancel downloads.

chrome/browser/ui/browser_list.cc

 // Copyright (c) 2011 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_list.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/download/download_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/tab_contents/navigation_details.h"
@@ skipping 157 matching lines @@
 }
 
 printing::BackgroundPrintingManager* GetBackgroundPrintingManager() {
   return g_browser_process->background_printing_manager();
 }
 
 // Returns true if all browsers can be closed without user interaction.
 // This currently checks if there is pending download, or if it needs to
 // handle unload handler.
 bool AreAllBrowsersCloseable() {
-  for (BrowserList::const_iterator i = BrowserList::begin();
-       i != BrowserList::end(); ++i) {
-    bool normal_downloads_are_present = false;
-    bool incognito_downloads_are_present = false;
-    (*i)->CheckDownloadsInProgress(&normal_downloads_are_present,
-                                   &incognito_downloads_are_present);
-    if (normal_downloads_are_present ||
-        incognito_downloads_are_present ||
-        (*i)->TabsNeedBeforeUnloadFired())
+  BrowserList::const_iterator browser_it = BrowserList::begin();
+  if (browser_it == BrowserList::end())

[achuithb, 2011/10/13 23:05:08]

Is this condition necessary? I believe the code should drop through the
condition below and the for loop and return true at the bottom of this function.

[Randy Smith (Not in Mondays), 2011/10/14 00:37:41]

It's pedantic, but I don't think so.  If there aren't any browsers, but there
*are* downloads, removing the test would be a semantic change.  And what's
currently there matches the semantics of the original routine.  There can be no
browsers if Chrome is in service mode, and while I don't like canceling the
downloads in that case, I haven't thought of a better solution (and I don't
think it'd necessarily belong in this CL if I had).

[achuithb, 2011/10/14 19:22:10]

Ok.

+    return true;
+
+  // If there are any downloads active, all browsers are not closeable.
+  if (DownloadService::TotalDownloadCount() > 0)
+    return false;
+
+  // Check TabsNeedBeforeUnloadFired().
+  for (; browser_it != BrowserList::end(); ++browser_it) {
+    if ((*browser_it)->TabsNeedBeforeUnloadFired())
       return false;
   }
   return true;
 }
 
 #if defined(OS_CHROMEOS)
 
 bool signout = false;
 
 // Fast shutdown for ChromeOS. It tells session manager to start
@@ skipping 578 matching lines @@
   // If no more TabContents from Browsers, check the BackgroundPrintingManager.
   while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
     cur_ = *bg_printing_iterator_;
     CHECK(cur_);
     ++bg_printing_iterator_;
     return;
   }
   // Reached the end - no more TabContents.
   cur_ = NULL;
 }