Remove ShouldBlockShelfAutoHide().

ui/views/bubble/tray_bubble_view.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/tray_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "cc/paint/paint_flags.h"
@@ skipping 31 matching lines @@
     TrayBubbleView::AnchorAlignment alignment) {
   if (alignment == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
     return base::i18n::IsRTL() ? BubbleBorder::BOTTOM_LEFT
                                : BubbleBorder::BOTTOM_RIGHT;
   }
   if (alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT)
     return BubbleBorder::LEFT_BOTTOM;
   return BubbleBorder::RIGHT_BOTTOM;
 }
 
+// Only one TrayBubbleView is visible at a time, but there are cases where the
+// lifetimes of two different bubbles can overlap briefly.
+int g_current_tray_bubble_view_count_ = 0;

[sky, 2017/04/24 15:32:40]

optional: name this g_current_tray_showing_count (or something to indicate it
corresponds to showing bubbles).

[Evan Stade, 2017/04/27 01:33:48]

Done.

+
 }  // namespace
 
 namespace internal {
 
 // Detects any mouse movement. This is needed to detect mouse movements by the
 // user over the bubble if the bubble got created underneath the cursor.
 class MouseMoveDetectorHost : public MouseWatcherHost {
  public:
   MouseMoveDetectorHost();
   ~MouseMoveDetectorHost() override;
@@ skipping 156 matching lines @@
   SetLayoutManager(layout_);
 }
 
 TrayBubbleView::~TrayBubbleView() {
   mouse_watcher_.reset();
   // Inform host items (models) that their views are being destroyed.
   if (delegate_)
     delegate_->BubbleViewDestroyed();
 }
 
+// static
+bool TrayBubbleView::IsATrayBubbleOpen() {
+  return g_current_tray_bubble_view_count_ > 0;
+}
+
 void TrayBubbleView::InitializeAndShowBubble() {
   layer()->parent()->SetMaskLayer(bubble_content_mask_->layer());
 
   GetWidget()->Show();
   GetWidget()->GetNativeWindow()->SetEventTargeter(
       std::unique_ptr<ui::EventTargeter>(new BubbleWindowTargeter(this)));
   UpdateBubble();
+
+  ++g_current_tray_bubble_view_count_;
 }
 
 void TrayBubbleView::UpdateBubble() {
   if (GetWidget()) {
     SizeToContents();
     bubble_content_mask_->layer()->SetBounds(layer()->bounds());
     GetWidget()->GetRootView()->SchedulePaint();
   }
 }
 
@@ skipping 26 matching lines @@
 
 void TrayBubbleView::OnBeforeBubbleWidgetInit(Widget::InitParams* params,
                                               Widget* bubble_widget) const {
   if (delegate_)
     delegate_->OnBeforeBubbleWidgetInit(anchor_widget(), bubble_widget, params);
   // Apply a WM-provided shadow (see ui/wm/core/).
   params->shadow_type = Widget::InitParams::SHADOW_TYPE_DROP;
   params->shadow_elevation = wm::ShadowElevation::LARGE;
 }
 
+void TrayBubbleView::OnWidgetClosing(Widget* widget) {
+  BubbleDialogDelegateView::OnWidgetClosing(widget);
+  --g_current_tray_bubble_view_count_;
+  DCHECK_GE(g_current_tray_bubble_view_count_, 0);
+}
+
 NonClientFrameView* TrayBubbleView::CreateNonClientFrameView(Widget* widget) {
   BubbleFrameView* frame = static_cast<BubbleFrameView*>(
       BubbleDialogDelegateView::CreateNonClientFrameView(widget));
   frame->SetBubbleBorder(std::move(owned_bubble_border_));
   return frame;
 }
 
 bool TrayBubbleView::WidgetHasHitTestMask() const {
   return true;
 }
@@ skipping 86 matching lines @@
 
 void TrayBubbleView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this) {
     details.parent->SetPaintToLayer();
     details.parent->layer()->SetMasksToBounds(true);
   }
 }
 
 }  // namespace views