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;
+
 }  // 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 112 matching lines @@
       min_width(min_width),
       max_width(max_width),
       max_height(0),
       can_activate(false),
       close_on_deactivate(true),
       bg_color(gfx::kPlaceholderColor) {}
 
 TrayBubbleView::InitParams::InitParams(const InitParams& other) = default;
 
 // static
+bool TrayBubbleView::IsATrayBubbleOpen() {
+  return g_current_tray_bubble_view_count_ > 0;
+}
+
+// static
 TrayBubbleView* TrayBubbleView::Create(View* anchor,
                                        Delegate* delegate,
                                        InitParams* init_params) {
   return new TrayBubbleView(anchor, delegate, *init_params);
 }
 
 TrayBubbleView::TrayBubbleView(View* anchor,
                                Delegate* delegate,
                                const InitParams& init_params)
     : BubbleDialogDelegateView(anchor,
@@ skipping 18 matching lines @@
   SetPaintToLayer();
 
   bubble_content_mask_.reset(
       new TrayBubbleContentMask(bubble_border_->GetBorderCornerRadius()));
 
   layout_->SetDefaultFlex(1);
   SetLayoutManager(layout_);
 }
 
 TrayBubbleView::~TrayBubbleView() {
+  --g_current_tray_bubble_view_count_;
+  DCHECK_GE(g_current_tray_bubble_view_count_, 0);
+
   mouse_watcher_.reset();
   // Inform host items (models) that their views are being destroyed.
   if (delegate_)
     delegate_->BubbleViewDestroyed();
 }
 
 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_;

[sky, 2017/04/21 20:43:49]

Is there a reason you like this here rather than the constructor? Is it because
you only care about actual showing bubbles?

[Evan Stade, 2017/04/22 00:10:25]

yes. In fact the decrement needs to come earlier, in OnWidgetClosing, so I've
moved it there (this created a subtle bug where the shelf wouldn't hide right
away but rather waited until you moved the mouse by a pixel).

This also exposed a bug which I've addressed here:
https://codereview.chromium.org/2834943002/#

 }
 
 void TrayBubbleView::UpdateBubble() {
   if (GetWidget()) {
     SizeToContents();
     bubble_content_mask_->layer()->SetBounds(layer()->bounds());
     GetWidget()->GetRootView()->SchedulePaint();
   }
 }
 
@@ skipping 132 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