Quickly close tabs/window with long-running unload handlers.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2012 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/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1757 matching lines @@
 // BrowserView, views::ClientView overrides:
 
 bool BrowserView::CanClose() {
   // You cannot close a frame for which there is an active originating drag
   // session.
   if (tabstrip_ && !tabstrip_->IsTabStripCloseable())
     return false;
 
   // Give beforeunload handlers the chance to cancel the close before we hide
   // the window below.
-  if (!browser_->ShouldCloseWindow())
-    return false;
-
-  if (!browser_->tab_strip_model()->empty()) {
-    // Tab strip isn't empty.  Hide the frame (so it appears to have closed
-    // immediately) and close all the tabs, allowing the renderers to shut
-    // down. When the tab strip is empty we'll be called back again.
-    frame_->Hide();
-    browser_->OnWindowClosing();
+  if (!browser->ShouldCloseWindow()) {
+    if (browser_->tab_strip_model()->empty()) {
+      // The browser needs to finish running unload handlers.
+      // Hide the window (so it appears to have closed immediately), and
+      // the browser will call us back again when it is ready to close.
+      frame_->Hide();
+    }
     return false;
   }
 
   // Empty TabStripModel, it's now safe to allow the Window to be closed.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_WINDOW_CLOSED,
       content::Source<gfx::NativeWindow>(frame_->GetNativeWindow()),
       content::NotificationService::NoDetails());
   return true;
 }
@@ skipping 792 matching lines @@
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }
 
 void BrowserView::MaybeStackBookmarkBarAtTop() {
   if (bookmark_bar_view_.get())
     bookmark_bar_view_->MaybeStackAtTop();
 }