MacViews: Support -[NSWindow close] on sheets.

ui/views/widget/native_widget_mac_unittest.mm

 // Copyright 2014 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 "ui/views/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
@@ skipping 980 matching lines @@
   // Visible immediately (although it animates from transparent).
   EXPECT_TRUE(modal_dialog_widget->IsVisible());
 
   // Run the animation.
   show_waiter.WaitForMethod();
   EXPECT_TRUE(modal_dialog_widget->IsVisible());
   EXPECT_TRUE(show_waiter.method_called());
   return modal_dialog_widget;
 }
 
+// Shows a window-modal Widget (as a sheet). No need to wait since the native
+// sheet animation is blocking.
+Widget* ShowWindowModalWidget(NSWindow* native_parent) {
+  Widget* sheet_widget = views::DialogDelegate::CreateDialogWidget(
+      new ModalDialogDelegate(ui::MODAL_TYPE_WINDOW), nullptr,
+      [native_parent contentView]);
+  sheet_widget->Show();
+  return sheet_widget;
+}
+
 }  // namespace
 
 // Tests object lifetime for the show/hide animations used for child-modal
 // windows. Parents the dialog off a native parent window (not a views::Widget).
 TEST_F(NativeWidgetMacTest, NativeWindowChildModalShowHide) {
   NSWindow* native_parent = MakeNativeParent();
   {
     Widget* modal_dialog_widget = ShowChildModalWidgetAndWait(native_parent);
     TestWidgetObserver widget_observer(modal_dialog_widget);
 
@@ skipping 139 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE([sheet_window delegate]);
 
   EXPECT_TRUE(did_observe);  // Also ensures the Close() actually uses sheets.
   [[NSNotificationCenter defaultCenter] removeObserver:observer];
 
   EXPECT_TRUE(widget_observer.widget_closed());
   EXPECT_TRUE([parent_close_button isEnabled]);
 }
 
+// Tests behavior when closing a window that is a sheet, or that hosts a sheet.

[Robert Sesek, 2017/01/13 20:02:47]

Also worth testing re-showing a sheet on a window that had previously closed a
sheet?

[tapted, 2017/01/13 20:52:51]

Done.

+TEST_F(NativeWidgetMacTest, CloseWithWindowModalSheet) {
+  NSWindow* native_parent =
+      MakeNativeParentWithStyle(NSClosableWindowMask | NSTitledWindowMask);
+  {
+    Widget* sheet_widget = ShowWindowModalWidget(native_parent);
+    WidgetChangeObserver widget_observer(sheet_widget);
+
+    // Test synchronous close (asynchronous close is tested above).
+    sheet_widget->CloseNow();
+    EXPECT_TRUE(widget_observer.widget_closed());
+
+    // Spin the RunLoop to ensure the task that ends the modal session on
+    // |native_parent| is executed. Otherwise |native_parent| will refuse to
+    // show another sheet.
+    base::RunLoop().RunUntilIdle();
+  }
+  {
+    Widget* sheet_widget = ShowWindowModalWidget(native_parent);
+    WidgetChangeObserver widget_observer(sheet_widget);
+
+    // Test native -[NSWindow close] on the sheet. Does not animate.
+    [sheet_widget->GetNativeWindow() close];
+    EXPECT_TRUE(widget_observer.widget_closed());
+    base::RunLoop().RunUntilIdle();
+  }
+
+  {
+    Widget* sheet_widget = ShowWindowModalWidget(native_parent);
+    WidgetChangeObserver widget_observer(sheet_widget);
+
+    // Test -[NSWindow close] on the parent window.
+    [native_parent close];
+    EXPECT_TRUE(widget_observer.widget_closed());
+  }
+}
+
 // Test calls to Widget::ReparentNativeView() that result in a no-op on Mac.
 // Tests with both native and non-native parents.
 TEST_F(NativeWidgetMacTest, NoopReparentNativeView) {
   NSWindow* parent = MakeNativeParent();
   Widget* dialog = views::DialogDelegate::CreateDialogWidget(
       new DialogDelegateView, nullptr, [parent contentView]);
   BridgedNativeWidget* bridge =
       NativeWidgetMac::GetBridgeForNativeWindow(dialog->GetNativeWindow());
 
   EXPECT_EQ(bridge->parent()->GetNSWindow(), parent);
@@ skipping 692 matching lines @@
 
 - (void)dealloc {
   if (deallocFlag_) {
     DCHECK(!*deallocFlag_);
     *deallocFlag_ = true;
   }
   [super dealloc];
 }
 
 @end