Reland: Implement correct Panel closing sequence for Mac.

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // 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/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
+#include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
@@ skipping 70 matching lines @@
 
 - (void)addFindBar:(FindBarCocoaController*)findBarCocoaController {
   NSView* contentView = [[self window] contentView];
   [contentView addSubview:[findBarCocoaController view]];
 
   CGFloat maxY = NSMaxY([contentView frame]);
   CGFloat maxWidth = NSWidth([contentView frame]);
   [findBarCocoaController positionFindBarViewAtMaxY:maxY maxWidth:maxWidth];
 }
 
-- (void)closePanel {
-  windowShim_->panel()->Close();
-}
-
-- (void)windowWillClose:(NSNotification*)notification {
-  [self autorelease];
-}
-
 - (NSView*)tabContentsView {
   TabContents* contents = windowShim_->browser()->GetSelectedTabContents();
   CHECK(contents);
   NSView* tabContentView = contents->GetNativeView();
   CHECK(tabContentView);
   return tabContentView;
 }
 
 - (PanelTitlebarViewCocoa*)titlebarView {
   return titlebar_view_;
@@ skipping 49 matching lines @@
 // determined by the key flags.
 - (void)commandDispatchUsingKeyModifiers:(id)sender {
   DCHECK(sender);
   NSEvent* event = [NSApp currentEvent];
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEventWithFlags(
           event, [event modifierFlags]);
   windowShim_->browser()->ExecuteCommandWithDisposition(
       [sender tag], disposition);
 }
+
+// Handler for the custom Close button.
+- (void)closePanel {
+  windowShim_->panel()->Close();
+}
+
+// Called when the user wants to close the panel or from the shutdown process.
+// 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 onbeforeUnload 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.
+// This callback is only called if the standard Close button is enabled in XIB.
+- (BOOL)windowShouldClose:(id)sender {
+  Browser* browser = windowShim_->browser();
+  // Give beforeunload handlers the chance to cancel the close before we hide
+  // the window below.
+  if (!browser->ShouldCloseWindow())
+    return NO;
+
+  if (!browser->tabstrip_model()->empty()) {
+    // Tab strip isn't empty. Make browser to close all the tabs, allowing the
+    // renderer to shut down and call us back again.
+    // The tab strip of Panel is not visible and contains only one tab but
+    // it still has to be closed.
+    browser->OnWindowClosing();
+    return NO;
+  }
+
+  // the tab strip is empty, it's ok to close the window
+  return YES;
+}
+
+// When windowShouldClose returns YES (or if controller receives direct 'close'
+// signal), window will be unconditionally closed. Clean up.
+- (void)windowWillClose:(NSNotification*)notification {
+  DCHECK(windowShim_->browser()->tabstrip_model()->empty());
+
+  windowShim_->didCloseNativeWindow();
+  [self autorelease];
+}
+
 @end