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

chrome/browser/ui/cocoa/browser_window_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 532 matching lines @@
 // The Browser object is in control of whether or not we're allowed to close. It
 // may defer closing due to several states, such as onUnload handlers needing to
 // be fired. If closing is deferred, the Browser will handle the processing
 // required to get us to the closing state and (by watching for all the tabs
 // going away) will again call to close the window when it's finally ready.
 - (BOOL)windowShouldClose:(id)sender {
   // Disable updates while closing all tabs to avoid flickering.
   gfx::ScopedNSDisableScreenUpdates disabler;
   // Give beforeunload handlers the chance to cancel the close before we hide
   // the window below.
-  if (!browser_->ShouldCloseWindow())
+  if (!browser_->ShouldCloseWindow()) {
+    if (browser_->tab_strip_model()->empty()) {
+      // saveWindowPositionIfNeeded: only works if we are the last active
+      // window, but orderOut: ends up activating another window, so we
+      // have to save the window position before we call orderOut:.
+      [self saveWindowPositionIfNeeded];
+
+      // 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.
+      [[self window] orderOut:self];
+    }
     return NO;
+  }
 
   // saveWindowPositionIfNeeded: only works if we are the last active
   // window, but orderOut: ends up activating another window, so we
   // have to save the window position before we call orderOut:.
   [self saveWindowPositionIfNeeded];
 
-  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.
-    [[self window] orderOut:self];
-    browser_->OnWindowClosing();
-    return NO;
-  }
-
   // the tab strip is empty, it's ok to close the window
   return YES;
 }
 
 // Called right after our window became the main window.
 - (void)windowDidBecomeMain:(NSNotification*)notification {
   BrowserList::SetLastActive(browser_.get());
   [self saveWindowPositionIfNeeded];
 
   // TODO(dmaclach): Instead of redrawing the whole window, views that care
@@ skipping 1594 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)