| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/message_center/message_center_tray.h" | 5 #include "ui/message_center/message_center_tray.h" |
| 6 | 6 |
| 7 #include "base/observer_list.h" | 7 #include "base/observer_list.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "grit/ui_strings.h" | 9 #include "grit/ui_strings.h" |
| 10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 | 43 |
| 44 message_center_visible_ = delegate_->ShowMessageCenter(); | 44 message_center_visible_ = delegate_->ShowMessageCenter(); |
| 45 message_center_->SetMessageCenterVisible(message_center_visible_); | 45 message_center_->SetMessageCenterVisible(message_center_visible_); |
| 46 return message_center_visible_; | 46 return message_center_visible_; |
| 47 } | 47 } |
| 48 | 48 |
| 49 bool MessageCenterTray::HideMessageCenterBubble() { | 49 bool MessageCenterTray::HideMessageCenterBubble() { |
| 50 if (!message_center_visible_) | 50 if (!message_center_visible_) |
| 51 return false; | 51 return false; |
| 52 delegate_->HideMessageCenter(); | 52 delegate_->HideMessageCenter(); |
| 53 MarkMessageCenterHidden(); |
| 54 return true; |
| 55 } |
| 56 |
| 57 void MessageCenterTray::MarkMessageCenterHidden() { |
| 58 if (!message_center_visible_) |
| 59 return; |
| 53 message_center_visible_ = false; | 60 message_center_visible_ = false; |
| 54 message_center_->SetMessageCenterVisible(false); | 61 message_center_->SetMessageCenterVisible(false); |
| 55 // Some notifications (like system ones) should appear as popups again | 62 // Some notifications (like system ones) should appear as popups again |
| 56 // after the message center is closed. | 63 // after the message center is closed. |
| 57 if (message_center_->HasPopupNotifications()) | 64 if (message_center_->HasPopupNotifications()) |
| 58 ShowPopupBubble(); | 65 ShowPopupBubble(); |
| 59 NotifyMessageCenterTrayChanged(); | 66 NotifyMessageCenterTrayChanged(); |
| 60 return true; | |
| 61 } | 67 } |
| 62 | 68 |
| 63 void MessageCenterTray::ToggleMessageCenterBubble() { | 69 void MessageCenterTray::ToggleMessageCenterBubble() { |
| 64 if (message_center_visible_) | 70 if (message_center_visible_) |
| 65 HideMessageCenterBubble(); | 71 HideMessageCenterBubble(); |
| 66 else | 72 else |
| 67 ShowMessageCenterBubble(); | 73 ShowMessageCenterBubble(); |
| 68 } | 74 } |
| 69 | 75 |
| 70 void MessageCenterTray::ShowPopupBubble() { | 76 void MessageCenterTray::ShowPopupBubble() { |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 base::TimeDelta::FromHours(1); | 195 base::TimeDelta::FromHours(1); |
| 190 message_center()->EnterQuietModeWithExpire(expires_in); | 196 message_center()->EnterQuietModeWithExpire(expires_in); |
| 191 NotifyMessageCenterTrayChanged(); | 197 NotifyMessageCenterTrayChanged(); |
| 192 } | 198 } |
| 193 | 199 |
| 194 void MessageCenterTray::NotifyMessageCenterTrayChanged() { | 200 void MessageCenterTray::NotifyMessageCenterTrayChanged() { |
| 195 delegate_->OnMessageCenterTrayChanged(); | 201 delegate_->OnMessageCenterTrayChanged(); |
| 196 } | 202 } |
| 197 | 203 |
| 198 } // namespace message_center | 204 } // namespace message_center |
| OLD | NEW |