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

chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.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/gtk/download/download_in_progress_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "content/browser/download/download_manager.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 DownloadInProgressDialogGtk::DownloadInProgressDialogGtk(Browser* browser)
     : browser_(browser) {
-  int download_count =
-      DownloadServiceFactory::GetForProfile(
-          browser->profile())->GetDownloadManager()->in_progress_count();
+  int download_count;
+  Browser::DownloadClosePreventionType type =
+      browser_->OkToCloseWithInProgressDownloads(&download_count);
+
+  // This dialog should have been created within the same thread invocation
+  // as the original test that lead to us, so it should always not be ok
+  // to close.
+  DCHECK(type != Browser::DOWNLOAD_CLOSE_OK);

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

DCHECK_NE

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

Done.

+
+  // TODO(rdsmith): This dialog should be different depending on whether we're
+  // closing the last incognito window of a profile or doing browser shutdown.
+  // See http://crbug.com/88421.
 
   std::string warning_text;
   std::string explanation_text;
   std::string ok_button_text;
   std::string cancel_button_text;
   string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   if (download_count == 1) {
     warning_text =
         l10n_util::GetStringFUTF8(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING,
                                   product_name);
@@ skipping 41 matching lines @@
 
   gtk_widget_show_all(dialog);
 }
 
 void DownloadInProgressDialogGtk::OnResponse(GtkWidget* dialog,
                                              int response_id) {
   gtk_widget_destroy(dialog);
   browser_->InProgressDownloadResponse(response_id == GTK_RESPONSE_ACCEPT);
   delete this;
 }