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

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 3fbae1123fef928c841cf811c0e8906fa61f5076..18709972d59cbca6cc5fa2ee6373cd2817c19046 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -19,8 +19,8 @@
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
@@ -41,6 +41,7 @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
+#include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/extensions/crx_installer.h"
@@ -74,6 +75,7 @@
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
@@ -1037,6 +1039,72 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) {
   ShowDownloadsTab();
 }
 
+Browser::DownloadClosePreventionType Browser::OkToCloseWithInProgressDownloads(
+    int* num_downloads_blocking) const {
+  DCHECK(num_downloads_blocking);
+

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

I'd set *num_downloads_blocking to 0 here since an uninitialized value is and
could be passed in.

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

Done.

+  if (is_attempting_to_close_browser_)
+    return DOWNLOAD_CLOSE_OK;
+
+  // 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())
+    return DOWNLOAD_CLOSE_OK;
+
+  int total_download_count = DownloadService::TotalDownloadCount();
+  if (total_download_count == 0)
+    return DOWNLOAD_CLOSE_OK;   // No downloads; can definitely close.
+

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

Have you considered combining the above 3 conditions into 1 statement? Also,
total_download_count seems unnecessary to me.

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

My preference is for it being the way it is now; I think it makes the logic
clearer.  (And I had enough headaches trying to get the logic clear in my head
for this routine, albeit for the stuff below, that I don't want to make it less
clear intentionally :-}).
Syntactically or semantically?  If syntactically, it's used below.  If
semantically...well, I need to check it at some point in the code.  I could
avoid the check if there are any windows around, but I can avoid the window
check if there aren't any downloads around.  It seems like six of one, half a
dozen of the other.  Do you see a reason to only computer the total download
count if we're at the last window, as opposed to doing it the other way?

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

That's fine.
 
I was wrong - I didn't see it being used below. Sorry for the confusion.

+  // Let's figure out if we are the last window for our profile, and
+  // the last window period.
+  // Note that we cannot just use BrowserList::GetBrowserCount as browser
+  // windows closing is delayed and the returned count might include windows
+  // that are being closed.
+  // The browser allowed to be closed only if both of the following are true:
+  // 1. There are no downloads present for any profile or it is not the
+  //    last Browser.
+  // 2. (Incognito Browser) There are no incognito downloads associated with
+  //    the Browser's profile or it is not the last Browser associated with
+  //    that profile.
+  // Note the lack of parallelism: regular profiles are kept around until
+  // browser close, whereas incognito profiles are destroyed on last
+  // associated window close.
+  int profile_window_count = 0;

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

Does it make sense to move lines 1072-1085 into a separate function? Maybe in
BrowserList? I feel like this function is rather long making it difficult to
follow.

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

Huh.  I don't have that feeling about it.  The *logic* of the function is
convoluted, I agree, but I don't actually think subroutinizing it would help
(I'd love to come up with better comment phrasing, though).  But the function
doesn't seem that long to me--only 64 lines, 14 of which are a big old comment
in the middle.

I've played with the comments (eliminated the big one, actually); see if you're
more comfortable with the routine now.

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

Yup, definitely better since it fits on my 15" screen now.

+  int total_window_count = 0;
+  for (BrowserList::const_iterator iter = BrowserList::begin();
+       iter != BrowserList::end(); ++iter) {
+    // Don't count this browser window or any other in the process of closing.
+    Browser* const browser = *iter;
+    if (browser == this ||
+        browser->is_attempting_to_close_browser_)

[sky, 2011/10/13 20:23:43]

nit: move this up to the previous line.

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

You lost the condition to guard against counting popups/non-tabbed browser
windows. Was that intentional?

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

Done.

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

Yes.  See earlier comment on this CL @ 
http://codereview.chromium.org/7466033/diff/4001/chrome/browser/ui/browser.cc...

+      continue;
+
+    if ((*iter)->profile() == profile())
+      profile_window_count++;
+    total_window_count++;
+  }
+
+  // If there aren't any other windows, we're at browser shutdown.
+  if (total_window_count == 0) {
+    *num_downloads_blocking = total_download_count;
+    return DOWNLOAD_CLOSE_BROWSER_SHUTDOWN;
+  }
+
+  // If there aren't any other windows on our profile, we're an incognito
+  // profile, and there are downloads associated with that profile,
+  // indicate that.
+  DownloadService* download_service =
+      DownloadServiceFactory::GetForProfile(profile());
+  if (profile_window_count == 0 && download_service->DownloadCount() > 0 &&
+      profile()->IsOffTheRecord()) {
+    *num_downloads_blocking = download_service->DownloadCount();
+    return DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE;
+  }
+
+  // Those are the only conditions under which we will block shutdown.
+  return DOWNLOAD_CLOSE_OK;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModel pass-thrus:
 
@@ -4852,36 +4920,6 @@ void Browser::ClearUnloadState(TabContents* tab, bool process_now) {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, In-progress download termination handling (private):
 
-void Browser::CheckDownloadsInProgress(bool* normal_downloads_are_present,
-                                       bool* incognito_downloads_are_present) {
-  *normal_downloads_are_present = false;
-  *incognito_downloads_are_present = false;
-
-  // If there are no download in-progress, our job is done.
-  DownloadManager* download_manager = NULL;
-  DownloadService* download_service =
-      DownloadServiceFactory::GetForProfile(profile());
-  // But first we need to check for the existence of the download manager, as
-  // GetDownloadManager() will unnecessarily try to create one if it does not
-  // exist.
-  if (download_service->HasCreatedDownloadManager())
-    download_manager = download_service->GetDownloadManager();
-  if (profile()->IsOffTheRecord()) {
-    // Browser is incognito and so download_manager if present is for incognito
-    // downloads.
-    *incognito_downloads_are_present =
-        (download_manager && download_manager->in_progress_count() != 0);
-    // Check original profile.
-    DownloadService* download_service = DownloadServiceFactory::GetForProfile(
-        profile()->GetOriginalProfile());
-    if (download_service->HasCreatedDownloadManager())
-      download_manager = download_service->GetDownloadManager();
-  }
-
-  *normal_downloads_are_present =
-      (download_manager && download_manager->in_progress_count() != 0);
-}
-
 bool Browser::CanCloseWithInProgressDownloads() {
   if (cancel_download_confirmation_state_ != NOT_PROMPTED) {

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

I know this is not your code, but do you think you could change this to:

if (cancel_download_confirmation_state_ != NOT_PROMPTED)
  return cancel_download_confirmation_state_ != WAITING_FOR_RESPONSE;

It would make this more readable and concise.

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

I agree with you, but I'm reluctant to make a change to code I don't own, when
also requested by a non-owner, in an unrelated CL.  Miranda, Scott: If either of
you want to bless this request, I'm happy to do it.

[Randy Smith (Not in Mondays), 2011/10/14 16:13:03]

Done.

     if (cancel_download_confirmation_state_ == WAITING_FOR_RESPONSE) {
@@ -4891,61 +4929,14 @@ bool Browser::CanCloseWithInProgressDownloads() {
     // RESPONSE_RECEIVED case, the user decided to go along with the closing.
     return true;
   }
-  // Indicated that normal (non-incognito) downloads are pending.
-  bool normal_downloads_are_present = false;
-  bool incognito_downloads_are_present = false;
-  CheckDownloadsInProgress(&normal_downloads_are_present,
-                           &incognito_downloads_are_present);
-  if (!normal_downloads_are_present && !incognito_downloads_are_present)
-    return true;
-
-  if (is_attempting_to_close_browser_)
-    return true;
-
-  if ((!normal_downloads_are_present && !profile()->IsOffTheRecord()) ||
-      (!incognito_downloads_are_present && profile()->IsOffTheRecord()))
-    return true;
 
-  // Let's figure out if we are the last window for our profile.
-  // Note that we cannot just use BrowserList::GetBrowserCount as browser
-  // windows closing is delayed and the returned count might include windows
-  // that are being closed.
-  // The browser allowed to be closed only if:
-  // 1. It is a regular browser and there are no regular downloads present or
-  //    this is not the last regular browser window.
-  // 2. It is an incognito browser and there are no incognito downloads present
-  //    or this is not the last incognito browser window.
-  int count = 0;
-  for (BrowserList::const_iterator iter = BrowserList::begin();
-       iter != BrowserList::end(); ++iter) {
-    // Don't count this browser window or any other in the process of closing.
-    // Only consider tabbed browser windows, not popups.
-    Browser* const browser = *iter;
-    if (browser == this
-        || browser->is_attempting_to_close_browser_
-        || !browser->is_type_tabbed())
-      continue;
-
-    // Verify that this is not the last non-incognito or incognito browser,
-    // depending on the pending downloads.
-    if (normal_downloads_are_present && !profile()->IsOffTheRecord() &&
-        browser->profile()->IsOffTheRecord())
-      continue;
-    if (incognito_downloads_are_present && profile()->IsOffTheRecord() &&
-        !browser->profile()->IsOffTheRecord())
-      continue;
-
-    // We test the original profile, because an incognito browser window keeps
-    // the original profile alive (and its DownloadManager).
-    // We also need to test explicitly the profile directly so that 2 incognito
-    // profiles count as a match.
-    if ((*iter)->profile() == profile() ||
-        (*iter)->profile()->GetOriginalProfile() == profile())
-      count++;
-  }
-  if (count > 0)
+  int num_downloads_blocking;
+  if (DOWNLOAD_CLOSE_OK ==
+      OkToCloseWithInProgressDownloads(&num_downloads_blocking))
     return true;
 
+  // Closing this window will kill some downloads; prompt to make sure
+  // that's ok.
   cancel_download_confirmation_state_ = WAITING_FOR_RESPONSE;
   window_->ConfirmBrowserCloseWithPendingDownloads();