Index: ash/common/system/web_notification/web_notification_tray.cc |
diff --git a/ash/common/system/web_notification/web_notification_tray.cc b/ash/common/system/web_notification/web_notification_tray.cc |
index c6487da949363e3fb1ad3024c5f3515618ad3942..a45bf002fa7ec334bf19fd2791f8a76ffeb3615b 100644 |
--- a/ash/common/system/web_notification/web_notification_tray.cc |
+++ b/ash/common/system/web_notification/web_notification_tray.cc |
@@ -384,7 +384,6 @@ bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) { |
message_center_bubble_.reset(new WebNotificationBubbleWrapper( |
this, anchor_tray, message_center_bubble)); |
- system_tray_->SetHideNotifications(true); |
shelf()->UpdateAutoHideState(); |
SetIsActive(true); |
return true; |
@@ -401,7 +400,6 @@ void WebNotificationTray::HideMessageCenter() { |
message_center_bubble_.reset(); |
should_block_shelf_auto_hide_ = false; |
show_message_center_on_unlock_ = false; |
- system_tray_->SetHideNotifications(false); |
shelf()->UpdateAutoHideState(); |
} |
@@ -429,8 +427,7 @@ void WebNotificationTray::HidePopups() { |
// Private methods. |
bool WebNotificationTray::ShouldShowMessageCenter() { |
- return WmShell::Get()->system_tray_delegate()->ShouldShowNotificationTray() && |
- !system_tray_->HasNotificationBubble(); |
+ return WmShell::Get()->system_tray_delegate()->ShouldShowNotificationTray(); |
} |
bool WebNotificationTray::ShouldBlockShelfAutoHide() const { |