MacViews: Fix views_unittests BubbleDelegateTest.CloseReasons

ui/views/bubble/bubble_delegate_unittest.cc

 // 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 <stddef.h>
 
 #include "base/macros.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
+#if defined(OS_MACOSX)
+#include "ui/base/test/scoped_fake_nswindow_focus.h"
+#endif
+
 namespace views {
 
 namespace {
 
 class TestBubbleDelegateView : public BubbleDelegateView {
  public:
   TestBubbleDelegateView(View* anchor_view)
       : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
         view_(new View()) {
     view_->SetFocusable(true);
@@ skipping 31 matching lines @@
   // Creates a test widget that owns its native widget.
   Widget* CreateTestWidget() {
     Widget* widget = new Widget();
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     widget->Init(params);
     return widget;
   }
 
  private:
+#if defined(OS_MACOSX)
+  ui::test::ScopedFakeNSWindowFocus fake_focus;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(BubbleDelegateTest);
 };
 
 }  // namespace
 
 TEST_F(BubbleDelegateTest, CreateDelegate) {
   scoped_ptr<Widget> anchor_widget(CreateTestWidget());
   BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
       anchor_widget->GetContentsView(), BubbleBorder::NONE);
   bubble_delegate->set_color(SK_ColorGREEN);
@@ skipping 192 matching lines @@
 }
 
 TEST_F(BubbleDelegateTest, CloseReasons) {
   {
     scoped_ptr<Widget> anchor_widget(CreateTestWidget());
     BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
         anchor_widget->GetContentsView(), BubbleBorder::NONE);
     bubble_delegate->set_close_on_deactivate(true);
     Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_delegate);
     bubble_widget->Show();
+    EXPECT_TRUE(bubble_widget->IsVisible());

[tapted, 2016/03/01 02:42:39]

OK - so the reason this currently works on Aura is some code in
NativeWidgetAura::InitNativeWidget()


  gfx::NativeView parent = params.parent;
  if (!params.child) {
    ..
    if (parent && parent->type() != ui::wm::WINDOW_TYPE_UNKNOWN) {
      ..
      parent = NULL;
    }
    ..
  }

  if (parent) {
    parent->AddChild(window_);
  } else {
    ..
  }

i.e. for a top-level widget (child = false), the `parent` is removed, and it's
not added as a ChildWindow as far as Aura::Window::IsVisible(..) is concerned.


So I think we can say here

#if defined(USE_AURA)
  // Bubbles are top-level which, on Aura, causes the parent->child
  // relationship to be managed by wm::TransientWindowManager
  // rather than the ui::Layer hierarchy. TransientWindowManager
  // currently permits a child to be shown when its parent is hidden,
  // but it shouldn't. This is http://crbug.com/XXXXX.
  EXPECT_TRUE(bubble_widget->IsVisible());
#else
  EXPECT_FALSE(bubble_widget->IsVisible());
#endif

anchor_widget->Show();
EXPECT_TRUE(bubble_widget->IsVisible());

[Patti Lor, 2016/03/01 06:54:48]

Done, have also applied the same ifdefs to the IsClosed() and CloseReason
checks.

     anchor_widget->Activate();
     EXPECT_TRUE(bubble_widget->IsClosed());
     EXPECT_EQ(BubbleDelegateView::CloseReason::DEACTIVATION,
               bubble_delegate->close_reason());
   }
 
   {
     scoped_ptr<Widget> anchor_widget(CreateTestWidget());
     BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
         anchor_widget->GetContentsView(), BubbleBorder::NONE);
@@ skipping 22 matching lines @@
         close_button,
         ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
                        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
     EXPECT_TRUE(bubble_widget->IsClosed());
     EXPECT_EQ(BubbleDelegateView::CloseReason::CLOSE_BUTTON,
               bubble_delegate->close_reason());
   }
 }
 
 }  // namespace views