Index: ash/common/system/status_area_widget.cc |
diff --git a/ash/common/system/status_area_widget.cc b/ash/common/system/status_area_widget.cc |
index 1fe17f64284d53add21b975cd45565e34177b97b..1c2e13865318255d4d1a741c2b25c7a0d15ccc2e 100644 |
--- a/ash/common/system/status_area_widget.cc |
+++ b/ash/common/system/status_area_widget.cc |
@@ -143,16 +143,11 @@ bool StatusAreaWidget::ShouldShowShelf() const { |
if (ime_menu_tray_ && ime_menu_tray_->ShouldBlockShelfAutoHide()) |
return true; |
- if (!wm_shelf_->IsVisible()) |
- return false; |
- |
- // If the shelf is currently visible, don't hide the shelf if the mouse |
- // is in any of the notification bubbles. |
- return system_tray_ && system_tray_->IsMouseInNotificationBubble(); |
+ return false; |
} |
bool StatusAreaWidget::IsMessageBubbleShown() const { |
- return ((system_tray_ && system_tray_->IsAnyBubbleVisible()) || |
+ return ((system_tray_ && system_tray_->IsSystemBubbleVisible()) || |
(web_notification_tray_ && |
web_notification_tray_->IsMessageCenterBubbleVisible())); |
} |