Remove ShouldBlockShelfAutoHide().

ui/views/bubble/tray_bubble_view.h

 // 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.
 
 #ifndef UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_
 #define UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 namespace views {
 
 namespace internal {
 class TrayBubbleContentMask;
 }
 
 // Specialized bubble view for bubbles associated with a tray icon (e.g. the
 // Ash status area). Mostly this handles custom anchor location and arrow and
 // border rendering. This also has its own delegate for handling mouse events
 // and other implementation specific details.
-class VIEWS_EXPORT TrayBubbleView : public views::BubbleDialogDelegateView,
-                                    public views::MouseWatcherListener {
+class VIEWS_EXPORT TrayBubbleView : public BubbleDialogDelegateView,
+                                    public MouseWatcherListener {
  public:
   // AnchorAlignment determines to which side of the anchor the bubble will
   // align itself.
   enum AnchorAlignment {
     ANCHOR_ALIGNMENT_BOTTOM,
     ANCHOR_ALIGNMENT_LEFT,
     ANCHOR_ALIGNMENT_RIGHT,
   };
 
   class VIEWS_EXPORT Delegate {
@@ skipping 43 matching lines @@
     SkColor bg_color;
   };
 
   // Constructs and returns a TrayBubbleView. |init_params| may be modified.
   static TrayBubbleView* Create(views::View* anchor,
                                 Delegate* delegate,
                                 InitParams* init_params);
 
   ~TrayBubbleView() override;
 
+  // Returns whether a tray bubble is active.
+  static bool IsATrayBubbleOpen();
+
   // Sets up animations, and show the bubble. Must occur after CreateBubble()
   // is called.
   void InitializeAndShowBubble();
 
   // Called whenever the bubble size or location may have changed.
   void UpdateBubble();
 
   // Sets the maximum bubble height and resizes the bubble.
   void SetMaxHeight(int height);
 
@@ skipping 17 matching lines @@
   // Overridden from views::WidgetDelegate.
   views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) override;
   bool WidgetHasHitTestMask() const override;
   void GetWidgetHitTestMask(gfx::Path* mask) const override;
   base::string16 GetAccessibleWindowTitle() const override;
 
   // Overridden from views::BubbleDialogDelegateView.
   void OnBeforeBubbleWidgetInit(Widget::InitParams* params,
                                 Widget* bubble_widget) const override;
+  void OnWidgetClosing(Widget* widget) override;
 
   // Overridden from views::View.
   gfx::Size GetPreferredSize() const override;
   gfx::Size GetMaximumSize() const override;
   int GetHeightForWidth(int width) const override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
   // Overridden from MouseWatcherListener
@@ skipping 30 matching lines @@
 
   // Used to find any mouse movements.
   std::unique_ptr<MouseWatcher> mouse_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_