Constrained window sheet controller (test patch)

chrome/browser/ui/cocoa/constrained_window_mac.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.
 
 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"
 
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #import "third_party/GTM/AppKit/GTMWindowSheetController.h"
 
 ConstrainedWindowMacDelegateSystemSheet::
 ConstrainedWindowMacDelegateSystemSheet(id delegate, SEL didEndSelector)
     : systemSheet_(nil),
       delegate_([delegate retain]),
@@ skipping 98 matching lines @@
     }
     window = [window parentWindow];
   }
 
   // It's valid for the window to be nil. For example, background tabs don't
   // have a window set. However, if a window exists then there should always
   // be a window controller that implements the ConstrainedWindowSupport
   // protocol.
   DCHECK(!window || window_controller);
 
-  if ([window_controller canAttachConstrainedWindow])
-    Realize(window_controller);
+  Realize(window_controller);
 }
 
 void ConstrainedWindowMac::CloseConstrainedWindow() {
   // Protection against reentrancy, which might otherwise become a problem if
   // DeleteDelegate forcibly closes a constrained window in a way that results
   // in CloseConstrainedWindow being called again.
   if (closing_)
     return;
 
   closing_ = true;
 
-  // Note: controller_ can be `nil` here if the sheet was never realized. That's
-  // ok.
-  [controller_ removeConstrainedWindow:this];
   delegate_->DeleteDelegate();
   tab_contents_->constrained_window_tab_helper()->WillClose(this);
 
   delete this;
 }
 
 void ConstrainedWindowMac::Realize(
     NSWindowController<ConstrainedWindowSupport>* controller) {
   if (!should_be_visible_)
     return;
 
   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.
   controller_ = controller;
-  [controller_ attachConstrainedWindow:this];
+
+  delegate_->RunSheet([controller_ sheetController],
+      [tab_contents_->web_contents()->GetNativeView() superview]);
   delegate_->set_sheet_open(true);
 }
+
+bool ConstrainedWindowMac::GetCanShow() const {
+  Browser* browser =
+      browser::FindBrowserWithWebContents(tab_contents_->web_contents());
+  if (!browser)
+    return true;
+  return !browser->window()->GetIsShowingInstant();
+}