Relanding in-progress download bug fix

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 1507 matching lines @@
       // them. Once they have fired, we'll get a message back saying whether
       // to proceed closing the page or not, which sends us back to this method
       // with the HasUnloadListener bit cleared.
       web_contents->render_view_host()->FirePageBeforeUnload();
       return true;
     }
   }
   return false;
 }
 
+bool Browser::CanCloseContentsAt(int index) {
+  if (tabstrip_model_.count() > 1)
+    return true;
+  // We are closing the last tab for this browser. Make sure to check for
+  // in-progress downloads.
+  // Note that the next call when it returns false will ask the user for
+  // confirmation before closing the browser if the user decides so.
+  return CanCloseWithInProgressDownloads();
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModelObserver implementation:
 
 void Browser::TabInsertedAt(TabContents* contents,
                             int index,
                             bool foreground) {
   contents->set_delegate(this);
   contents->controller().SetWindowID(session_id());
 
@@ skipping 1113 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }