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

This reverts commit 340c91ba33fcdb81885b353635c16b9ff91d1f37.

Revert "Disable BrowserCloseTest.DownloadsCloseCheck_3. It fails on ASAN Tests (2) and Linux x64."

This reverts commit 06b7c55aadc63d0d23cd4248203d6f9c80895210.

Revert "touchui: Fix browser_tests compile."

This reverts commit dc0f37f22f819d92c36534199922b606891c1c4a.

Revert "Disable BrowserCloseTest.DownloadsCloseCheck_1 on Mac."

This reverts commit 353f4150ab6ec68a7c9d9e9d9afecbf2e110de52.

BUG=100566
TEST=
TBR=rdsmith

Review URL: http://codereview.chromium.org/8316016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105887 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 23 deletions

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index e383062..26a9ad4 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -109,21 +109,6 @@ class Browser : public TabHandlerDelegate,
     FEATURE_DOWNLOADSHELF = 128
   };
 
-  // The context for a download blocked notification from
-  // OkToCloseWithInProgressDownloads.
-  enum DownloadClosePreventionType {
-    // Browser close is not blocked by download state.
-    DOWNLOAD_CLOSE_OK,
-
-    // The browser is shutting down and there are active downloads
-    // that would be cancelled.
-    DOWNLOAD_CLOSE_BROWSER_SHUTDOWN,
-
-    // There are active downloads associated with this incognito profile
-    // that would be canceled.
-    DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE,
-  };
-
   struct CreateParams {
     CreateParams(Type type, Profile* profile);
 
@@ -356,20 +341,16 @@ class Browser : public TabHandlerDelegate,
 
   // In-progress download termination handling /////////////////////////////////
 
+  // Are normal and/or incognito downloads in progress?
+  void CheckDownloadsInProgress(bool* normal_downloads,
+                                bool* incognito_downloads);
+
   // 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.
-  // If executing downloads would be cancelled by this window close,
-  // then |*num_downloads_blocking| is updated with how many downloads
-  // would be canceled if the close continued.
-  DownloadClosePreventionType OkToCloseWithInProgressDownloads(
-      int* num_downloads_blocking) const;
-
   // TabStripModel pass-thrus /////////////////////////////////////////////////
 
   TabStripModel* tabstrip_model() const {