Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: ash/system/status_area_widget.cc

Issue 2831233003: Remove ShouldBlockShelfAutoHide(). (Closed)
Patch Set: rename and rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698