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

Unified Diff: ash/common/system/web_notification/web_notification_tray.cc

Issue 2583393002: Send notification to users upon receiving sms messages (Closed)
Patch Set: update return type Created 3 years, 10 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/common/system/user/tray_user_unittest.cc ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ce82103006259a23d801fdf220ccd162e0fcdbdf..ec38b079b842c9b4e6341a69cb0a3c81f2595a80 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 {
« no previous file with comments | « ash/common/system/user/tray_user_unittest.cc ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698