Mac: the return of the tab-modal-sheets patch.

chrome/browser/cocoa/constrained_window_mac.mm

 // Copyright (c) 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/cocoa/constrained_window_mac.h"
 
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #import "third_party/GTM/AppKit/GTMWindowSheetController.h"
 
 ConstrainedWindowMacDelegate::~ConstrainedWindowMacDelegate() {}
 
+void ConstrainedWindowMacDelegateSystemSheetParams::RunSheet(
+    GTMWindowSheetController* sheetController,
+    NSView* view,
+    SEL frameSelector,
+    SEL positionSelector) {
+  DCHECK([params_ isKindOfClass:[NSArray class]]);
+  [sheetController beginSystemSheet:systemSheet_
+                       modalForView:view
+                      frameSelector:frameSelector
+                   positionSelector:positionSelector
+                     withParameters:params_];
+}
+
 void ConstrainedWindowMacDelegateSystemSheet::RunSheet(
     GTMWindowSheetController* sheetController,
-    NSView* view) {
+    NSView* view,
+    SEL frameSelector,
+    SEL positionSelector) {
   NSArray* params = [NSArray arrayWithObjects:
       [NSNull null],  // window, must be [NSNull null]
       delegate_.get(),
       [NSValue valueWithPointer:didEndSelector_],
       [NSValue valueWithPointer:NULL],  // context info for didEndSelector_.
       nil];
-  [sheetController beginSystemSheet:systemSheet_
-                       modalForView:view
-                     withParameters:params];
+  set_params(params);
+  ConstrainedWindowMacDelegateSystemSheetParams::RunSheet(sheetController,
+                                                          view,
+                                                          frameSelector,
+                                                          positionSelector);
 }
 
 void ConstrainedWindowMacDelegateCustomSheet::RunSheet(
     GTMWindowSheetController* sheetController,
-    NSView* view) {
+    NSView* view,
+    SEL frameSelector,
+    SEL positionSelector) {
   [sheetController beginSheet:customSheet_.get()
                  modalForView:view
+                frameSelector:frameSelector
+             positionSelector:positionSelector
                 modalDelegate:delegate_.get()
                didEndSelector:didEndSelector_
                   contextInfo:NULL];
 }
 
 // static
 ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
     TabContents* parent,
     ConstrainedWindowMacDelegate* delegate) {
   return new ConstrainedWindowMac(parent, delegate);
@@ skipping 17 matching lines @@
     Realize(static_cast<BrowserWindowController*>(controller));
   }
 }
 
 ConstrainedWindowMac::~ConstrainedWindowMac() {}
 
 void ConstrainedWindowMac::CloseConstrainedWindow() {
   // Note: controller_ can be `nil` here if the sheet was never realized. That's
   // ok.
   [controller_ removeConstrainedWindow:this];
-  delegate_->DeleteDelegate();
-  owner_->WillClose(this);
+
+  DCHECK(delegate_);
+  if (delegate_)
+    delegate_->DeleteDelegate();
+
+  DCHECK(owner_);
+  if (owner_)
+    owner_->WillClose(this);
 
   delete this;
 }
 
+bool ConstrainedWindowMac::ParentWillDo(ConstrainedWindow::Event event) {
+  // Just get our delegate to handle it. If it doesn't do anything, call our
+  // super's handler.
+  DCHECK(delegate_);
+  if (delegate_) {
+    if (delegate_->ParentWillDo(event))
+      return true;
+  }
+  return ConstrainedWindow::ParentWillDo(event);
+}
+
 void ConstrainedWindowMac::Realize(BrowserWindowController* controller) {
   if (controller_ != nil) {
     DCHECK(controller_ == controller);
     return;
   }
   DCHECK(controller != nil);
 
   // Remember the controller we're adding ourselves to, so that we can later
   // remove us from it.
   if ([controller attachConstrainedWindow:this])
     controller_ = controller;
 }
 
 void ConstrainedWindowMac::SetVisible() {
   // Only notify the delegate that the sheet is open after the sheet appeared
   // on screen (as opposed to when the sheet was added to the current tab's
   // sheet queue).
   delegate_->set_sheet_open(true);
 }