| Index: ash/common/shelf/shelf_tooltip_manager.cc
|
| diff --git a/ash/common/shelf/shelf_tooltip_manager.cc b/ash/common/shelf/shelf_tooltip_manager.cc
|
| index e84cb3a301704436645c2e409fe9a3ee9e0c3f17..e92ff5a8be3f3348501fd2032586b9847001fb4c 100644
|
| --- a/ash/common/shelf/shelf_tooltip_manager.cc
|
| +++ b/ash/common/shelf/shelf_tooltip_manager.cc
|
| @@ -250,8 +250,11 @@ void ShelfTooltipManager::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
|
| }
|
|
|
| bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
|
| - return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&
|
| - shelf_view_->wm_shelf()->GetVisibilityState() == SHELF_VISIBLE;
|
| + WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr;
|
| + return shelf && shelf_view_->ShouldShowTooltipForView(view) &&
|
| + (shelf->GetVisibilityState() == SHELF_VISIBLE ||
|
| + (shelf->GetVisibilityState() == SHELF_AUTO_HIDE &&
|
| + shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN));
|
| }
|
|
|
| } // namespace ash
|
|
|