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

chrome/browser/ui/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 94 matching lines @@
     // what the user has done.
     MAXIMIZED_STATE_DEFAULT,
 
     // Maximized state is explicitly maximized.
     MAXIMIZED_STATE_MAXIMIZED,
 
     // Maximized state is explicitly not maximized (normal).
     MAXIMIZED_STATE_UNMAXIMIZED
   };
 
+  // The context for a download blocked notification from
+  // OkToCloseWithInProgressDownloads; part of that function's interface.

[sky, 2011/07/21 20:08:11]

The last fragment of this sentence doesn't make sense to me.

[Randy Smith (Not in Mondays), 2011/07/21 21:36:31]

Removed.  What I was trying to say was just "this enum was created purely to be
part of that function's interface" but that's reasonably clear from context.

+  enum DownloadClosePreventionType {
+    // All downloads would be canceled.
+    BROWSER_SHUTDOWN,

[sky, 2011/07/21 20:08:11]

Can you prefix this with something to make it clear they are related to
DownloadClosePreventionType. Maybe DOWNLOAD_CLOSE_IN_SHUTDOWN and
DOWNLOAD_CLOSE_LAST_WINDOW_IN_... Or something.

[Randy Smith (Not in Mondays), 2011/07/21 21:36:31]

Done.

+
+    // Downloas associated with this incognito profile would be canceled.

[jennb, 2011/07/21 18:35:33]

typo - Downloas

[Randy Smith (Not in Mondays), 2011/07/21 21:36:31]

Done.

+    LAST_WINDOW_IN_INCOGNITO_PROFILE,
+  };
+
   struct CreateParams {
     CreateParams(Type type, Profile* profile);
 
     // The browser type.
     Type type;
 
     // The associated profile.
     Profile* profile;
 
     // The application name that is also the name of the window to the shell.
@@ skipping 210 matching lines @@
   // cleanup.
   void OnWindowClosing();
 
   // OnWindowActivationChanged handling ///////////////////////////////////////
 
   // Invoked when the window containing us is activated.
   void OnWindowActivated();
 
   // In-progress download termination handling /////////////////////////////////
 
-  // Are normal and/or incognito downloads in progress?
-  void CheckDownloadsInProgress(bool* normal_downloads,
-                                bool* incognito_downloads);
+  // How many downloads are in process globally, and on this window's profile?
+  void CheckDownloadsInProgress(int* total_download_count,
+                                int* profile_download_count) const;
 
   // Called when the user has decided whether to proceed or not with the browser
   // closure.  |cancel_downloads| is true if the downloads should be canceled
   // and the browser closed, false if the browser should stay open and the
   // downloads running.
   void InProgressDownloadResponse(bool cancel_downloads);
 
+  // Indicates whether or not this browser window can be closed, or
+  // would be blocked by in-progress downloads.
+  // Returns |true| if no executing downloads would be cancelled by this
+  // window close.  If executing downloads would be cancelled by this
+  // window close, then |*type| is updated with the type of close this
+  // is, and |*num_downloads_blocking| is updated with how many downloads
+  // would be canceled if the close continued.
+  bool OkToCloseWithInProgressDownloads(DownloadClosePreventionType* type,

[sky, 2011/07/21 20:08:11]

It's a little bizarre to have both a boolean return and an enum. Shouldn't the
true state be expressed as another element of the enum?

[Randy Smith (Not in Mondays), 2011/07/21 21:36:31]

Whoops, not sure how I missed that.  Right you are.  Done.

+                                        int* num_downloads_blocking) const;
+
   // TabStripModel pass-thrus /////////////////////////////////////////////////
 
   TabStripModel* tabstrip_model() const {
     // TODO(beng): remove this accessor. It violates google style.
     return tab_handler_->GetTabStripModel();
   }
 
   int tab_count() const;
   int active_index() const;
   int GetIndexOfController(const NavigationController* controller) const;
@@ skipping 897 matching lines @@
 
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_