MacViews: Hide windows before closing.

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"
 #import "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 347 matching lines @@
   EXPECT_FALSE([ns_window isVisible]);
   EXPECT_EQ(5, observer.gained_visible_count());
   EXPECT_EQ(5, observer.lost_visible_count());
 
   [ns_window makeKeyAndOrderFront:nil];
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_TRUE([ns_window isVisible]);
   EXPECT_EQ(6, observer.gained_visible_count());
   EXPECT_EQ(5, observer.lost_visible_count());
 
-  // No change when closing.
+  // Closing the widget also hides it.
   widget->CloseNow();
-  EXPECT_EQ(5, observer.lost_visible_count());
+  EXPECT_EQ(6, observer.lost_visible_count());
   EXPECT_EQ(6, observer.gained_visible_count());
 }
 
 // A view that counts calls to OnPaint().
 class PaintCountView : public View {
  public:
   PaintCountView() { SetBounds(0, 0, 100, 100); }
 
   // View:
   void OnPaint(gfx::Canvas* canvas) override {
@@ skipping 766 matching lines @@
     parent_nswindow_.reset([[child->GetNativeWindow() parentWindow] retain]);
     EXPECT_TRUE(parent_nswindow_);
     EXPECT_TRUE([parent_nswindow_ delegate]);
   }
 
   ~ParentCloseMonitor() override {
     EXPECT_TRUE(child_closed_);  // Otherwise the observer wasn't removed.
   }
 
   void OnWidgetDestroying(Widget* child) override {
-    // Upon a parent-triggered close, the NSWindow relationship will still exist
-    // (it's removed just after OnWidgetDestroying() returns). The parent should
-    // still be open (children are always closed first), but not have a delegate
-    // (since it is being torn down).
-    EXPECT_TRUE([child->GetNativeWindow() parentWindow]);
-    EXPECT_TRUE([parent_nswindow_ isVisible]);
+    // Closing the parent should hide it first, which will destroy the parent-
+    // child relationship. The parent should still be open (children are always
+    // closed first), but not have a delegate (since it is being torn down).
+    EXPECT_FALSE([child->GetNativeWindow() parentWindow]);
+    EXPECT_FALSE([parent_nswindow_ isVisible]);
     EXPECT_FALSE([parent_nswindow_ delegate]);
 
     EXPECT_FALSE(child_closed_);
   }

[tapted, 2016/10/28 05:13:17]

huh - there's not much difference between these now. I think that's OK. I think
the most important difference is that

[child->GetNativeWindow() delegate] should be non-nil in OnWidgetDestroying, but
nil in OnWidgetDestroyed. But there's coverage elsewhere. Up to you if you want
to add it

 
   void OnWidgetDestroyed(Widget* child) override {
-    EXPECT_FALSE([child->GetNativeWindow() parentWindow]);
-    EXPECT_TRUE([parent_nswindow_ isVisible]);
-    EXPECT_FALSE([parent_nswindow_ delegate]);
-
     EXPECT_FALSE(child_closed_);
     child->RemoveObserver(this);
     child_closed_ = true;
   }
 
   bool child_closed() const { return child_closed_; }
 
  private:
   base::scoped_nsobject<NSWindow> parent_nswindow_;
   bool child_closed_ = false;
@@ skipping 619 matching lines @@
 
 - (void)dealloc {
   if (deallocFlag_) {
     DCHECK(!*deallocFlag_);
     *deallocFlag_ = true;
   }
   [super dealloc];
 }
 
 @end