MacViews: Fix views_unittests BubbleDelegateTest.CloseReasons

ui/views/bubble/bubble_delegate.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 "ui/views/bubble/bubble_delegate.h"
 
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/default_style.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 20 matching lines @@
   Widget::InitParams bubble_params(Widget::InitParams::TYPE_BUBBLE);
   bubble_params.delegate = bubble;
   bubble_params.opacity = Widget::InitParams::TRANSLUCENT_WINDOW;
   bubble_params.accept_events = bubble->accept_events();
   if (bubble->parent_window())
     bubble_params.parent = bubble->parent_window();
   else if (bubble->anchor_widget())
     bubble_params.parent = bubble->anchor_widget()->GetNativeView();
   bubble_params.activatable = bubble->CanActivate() ?
       Widget::InitParams::ACTIVATABLE_YES : Widget::InitParams::ACTIVATABLE_NO;
+  bubble_params.child = true;
   bubble->OnBeforeBubbleWidgetInit(&bubble_params, bubble_widget);
   bubble_widget->Init(bubble_params);
   if (bubble_params.parent)
     bubble_widget->StackAbove(bubble_params.parent);
   return bubble_widget;
 }
 
 }  // namespace
 
 // static
@@ skipping 119 matching lines @@
 
 void BubbleDelegateView::OnWidgetVisibilityChanged(Widget* widget,
                                                    bool visible) {
 #if !defined(OS_WIN)
   HandleVisibilityChanged(widget, visible);
 #endif
 }
 
 void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget,
                                                    bool active) {
-  if (close_on_deactivate() && widget == GetWidget() && !active) {
+  // Only close the widget if it's been shown in the first place.

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

Was this necessary to get the test to pass? Otherwise hopefully we can avoid it
since I will need to think more about it

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

Have reverted this. The child = true change prevented the bubble being shown
without having shown the anchor, but it still closed on deactivation, so I added
the check to prevent it from closing when it wasn't even visible. I think this
is actually wrong though because the bubble was active without being visible.

+  if (close_on_deactivate() && widget == GetWidget() && !active &&
+      GetWidget()->IsActive()) {
     if (close_reason_ == CloseReason::UNKNOWN)
       close_reason_ = CloseReason::DEACTIVATION;
     GetWidget()->Close();
   }
 }
 
 void BubbleDelegateView::OnWidgetBoundsChanged(Widget* widget,
                                                const gfx::Rect& new_bounds) {
   if (GetBubbleFrameView() && anchor_widget() == widget)
     SizeToContents();
@@ skipping 138 matching lines @@
   // http://crbug.com/474622 for details.
   if (widget == GetWidget() && visible) {
     ui::AXViewState state;
     GetAccessibleState(&state);
     if (state.role == ui::AX_ROLE_ALERT_DIALOG)
       NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
 
 }  // namespace views