Chromium Code Reviews| Index: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm |
| diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm |
| index 405aabf62b71ec81db4283ae934e708c49890406..9f7e1d059fe19b8fd1ee6509eb3a84d6c076d5df 100644 |
| --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm |
| +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm |
| @@ -76,6 +76,7 @@ void MessageCenterTrayBridge::HideMessageCenter() { |
| [status_item_view_ setHighlight:NO]; |
| [tray_controller_ close]; |
| tray_controller_.autorelease(); |
| + UpdateStatusItem(); |
| } |
| bool MessageCenterTrayBridge::ShowNotifierSettings() { |
| @@ -86,19 +87,18 @@ bool MessageCenterTrayBridge::ShowNotifierSettings() { |
| void MessageCenterTrayBridge::UpdateStatusItem() { |
| // Only show the status item if there are notifications. |
|
Nico
2013/07/31 00:09:41
remove comment
dewittj
2013/07/31 00:37:09
Done.
|
| - if (message_center_->NotificationCount() == 0) { |
| - [status_item_view_ removeItem]; |
| - status_item_view_.reset(); |
| - return; |
| - } |
| - |
| if (!status_item_view_) { |
| status_item_view_.reset([[MCStatusItemView alloc] init]); |
| [status_item_view_ setCallback:^{ tray_->ToggleMessageCenterBubble(); }]; |
| } |
| + // We want a static message center icon while it's visible. |
| + if (message_center()->IsMessageCenterVisible()) |
| + return; |
| + |
| size_t unread_count = message_center_->UnreadNotificationCount(); |
| - [status_item_view_ setUnreadCount:unread_count]; |
| + bool quiet_mode = message_center_->IsQuietMode(); |
| + [status_item_view_ setUnreadCount:unread_count withQuietMode:quiet_mode]; |
| string16 product_name = l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME); |
| if (unread_count > 0) { |