Index: ash/system/status_area_widget.cc |
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc |
index 232602fce50975e722e99fc66746e2f1571077f9..13967cf7bb65cf9a1f017ecd3be0063642eeec62 100644 |
--- a/ash/system/status_area_widget.cc |
+++ b/ash/system/status_area_widget.cc |
@@ -136,18 +136,8 @@ void StatusAreaWidget::UpdateAfterLoginStatusChange(LoginStatus login_status) { |
} |
bool StatusAreaWidget::ShouldShowShelf() const { |
- if ((system_tray_ && system_tray_->ShouldShowShelf()) || |
- (web_notification_tray_ && |
- web_notification_tray_->ShouldBlockShelfAutoHide())) |
- return true; |
- |
- if (palette_tray_ && palette_tray_->ShouldBlockShelfAutoHide()) |
- return true; |
- |
- if (ime_menu_tray_ && ime_menu_tray_->ShouldBlockShelfAutoHide()) |
- return true; |
- |
- return false; |
+ return (system_tray_ && system_tray_->ShouldShowShelf()) || |
+ views::TrayBubbleView::IsATrayBubbleOpen(); |
} |
bool StatusAreaWidget::IsMessageBubbleShown() const { |