MacViews: Reattach children of native windows when they are exposed.

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 648 matching lines @@
   NSRect nsrect = gfx::ScreenRectToNSRect(screen_rect);
   NSPoint midpoint = NSMakePoint(NSMidX(nsrect), NSMidY(nsrect));
 
   id hit = [widget->GetNativeWindow() accessibilityHitTest:midpoint];
   id title = [hit accessibilityAttributeValue:NSAccessibilityTitleAttribute];
   EXPECT_NSEQ(title, @"Green");
 
   widget->CloseNow();
 }
 
-// Tests creating a views::Widget parented off a native NSWindow.
-TEST_F(NativeWidgetMacTest, NonWidgetParent) {
-  NSWindow* native_parent = MakeNativeParent();
+namespace {
 
+Widget* AttachPopupToNativeParent(NSWindow* native_parent) {
   base::scoped_nsobject<NSView> anchor_view(
       [[NSView alloc] initWithFrame:[[native_parent contentView] bounds]]);
   [[native_parent contentView] addSubview:anchor_view];
 
   // Note: Don't use WidgetTest::CreateChildPlatformWidget because that makes
   // windows of TYPE_CONTROL which need a parent Widget to obtain the focus
   // manager.
   Widget* child = new Widget;
   Widget::InitParams init_params;
   init_params.parent = anchor_view;
   init_params.type = Widget::InitParams::TYPE_POPUP;
   child->Init(init_params);
+  return child;
+}
 
+}  // namespace
+
+// Tests creating a views::Widget parented off a native NSWindow.
+TEST_F(NativeWidgetMacTest, NonWidgetParent) {
+  NSWindow* native_parent = MakeNativeParent();
+  Widget* child = AttachPopupToNativeParent(native_parent);
   TestWidgetObserver child_observer(child);
 
   // GetTopLevelNativeWidget() only goes as far as there exists a Widget (i.e.
   // must stop at |child|.
   internal::NativeWidgetPrivate* top_level_widget =
       internal::NativeWidgetPrivate::GetTopLevelNativeWidget(
           child->GetNativeView());
   EXPECT_EQ(child, top_level_widget->GetWidget());
 
   // To verify the parent, we need to use NativeWidgetMac APIs.
@@ skipping 10 matching lines @@
   EXPECT_TRUE(child->IsVisible());
   EXPECT_EQ(1u, [[native_parent childWindows] count]);
   EXPECT_EQ(child->GetNativeWindow(),
             [[native_parent childWindows] objectAtIndex:0]);
   EXPECT_EQ(native_parent, [child->GetNativeWindow() parentWindow]);
 
   // Only non-toplevel Widgets are positioned relative to the parent, so the
   // bounds set above should be in screen coordinates.
   EXPECT_EQ(child_bounds, child->GetWindowBoundsInScreen());
 
-  // Removing the anchor_view from its view hierarchy is permitted. This should
+  // Removing the anchor view from its view hierarchy is permitted. This should
   // not break the relationship between the two windows.
+  NSView* anchor_view = [[native_parent contentView] subviews][0];
+  EXPECT_TRUE(anchor_view);
   [anchor_view removeFromSuperview];
-  anchor_view.reset();
   EXPECT_EQ(native_parent, bridged_native_widget->parent()->GetNSWindow());
 
   // Closing the parent should close and destroy the child.
   EXPECT_FALSE(child_observer.widget_closed());
   [native_parent close];
   EXPECT_TRUE(child_observer.widget_closed());
 
   EXPECT_EQ(0u, [[native_parent childWindows] count]);
 }
 
@@ skipping 21 matching lines @@
     // close]. This test tries to establish a situation where the last reference
     // to the child window is released inside WidgetOwnerNSWindowAdapter::
     // OnWindowWillClose().
     base::mac::ScopedNSAutoreleasePool pool;
     [native_parent_.autorelease() close];
     EXPECT_TRUE(child_dealloced);
   }
   EXPECT_TRUE(native_parent_dealloced);
 }
 
+// Tests visibility for child of native NSWindow, reshowing after -[NSApp hide].
+TEST_F(NativeWidgetMacTest, VisibleAfterNativeParentShow) {
+  NSWindow* native_parent = MakeNativeParent();
+  Widget* child = AttachPopupToNativeParent(native_parent);
+  child->Show();
+  EXPECT_TRUE(child->IsVisible());
+
+  WidgetChangeObserver child_observer(child);
+  [NSApp hide:nil];
+  child_observer.WaitForVisibleCounts(0, 1);
+  EXPECT_FALSE(child->IsVisible());
+
+  [native_parent makeKeyAndOrderFront:nil];
+  child_observer.WaitForVisibleCounts(1, 1);
+  EXPECT_TRUE(child->IsVisible());
+
+  [native_parent close];
+}
+
 // Use Native APIs to query the tooltip text that would be shown once the
 // tooltip delay had elapsed.
 base::string16 TooltipTextForWidget(Widget* widget) {
   // For Mac, the actual location doesn't matter, since there is only one native
   // view and it fills the window. This just assumes the window is at least big
   // big enough for a constant coordinate to be within it.
   NSPoint point = NSMakePoint(30, 30);
   NSView* view = [widget->GetNativeView() hitTest:point];
   NSString* text =
       [view view:view stringForToolTip:0 point:point userData:nullptr];
@@ skipping 1031 matching lines @@
 
 - (void)dealloc {
   if (deallocFlag_) {
     DCHECK(!*deallocFlag_);
     *deallocFlag_ = true;
   }
   [super dealloc];
 }
 
 @end