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

Unified Diff: ui/message_center/message_center_bubble.h

Issue 12326091: Made notification center notifications collapsed and expandable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased, which led to many changes. Created 7 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
Index: ui/message_center/message_center_bubble.h
diff --git a/ui/message_center/message_center_bubble.h b/ui/message_center/message_center_bubble.h
index ba7adfad4493d3c9566f008e7a123a409431b3d2..6ceaf8a655e83a10ae71e19974a189a0b17afeb1 100644
--- a/ui/message_center/message_center_bubble.h
+++ b/ui/message_center/message_center_bubble.h
@@ -11,16 +11,18 @@
namespace message_center {
-class MessageCenterContentsView;
+class MessageCenterView;
// Bubble for message center.
-class MESSAGE_CENTER_EXPORT MessageCenterBubble : public MessageBubbleBase {
+class MESSAGE_CENTER_EXPORT MessageCenterBubble
+ : public MessageBubbleBase,
+ public NotificationList::Delegate {
dharcourt 2013/03/01 10:17:31 MessageCenterBubble now implements NotificationLis
Jun Mukai 2013/03/01 21:44:42 Inheriting Delegate is not a good idea here. Usual
dharcourt 2013/03/02 02:08:02 Sounds good. I've implemented this by taking the d
public:
- explicit MessageCenterBubble(NotificationList::Delegate* delegate);
+ explicit MessageCenterBubble(MessageCenter* message_center);
virtual ~MessageCenterBubble();
- // Overridden from MessageBubbleBase.
+ // Overridden from MessageBubbleBase:
virtual views::TrayBubbleView::InitParams GetInitParams(
views::TrayBubbleView::AnchorAlignment anchor_alignment) OVERRIDE;
virtual void InitializeContents(views::TrayBubbleView* bubble_view) OVERRIDE;
@@ -29,10 +31,24 @@ class MESSAGE_CENTER_EXPORT MessageCenterBubble : public MessageBubbleBase {
virtual void OnMouseEnteredView() OVERRIDE;
virtual void OnMouseExitedView() OVERRIDE;
+ // Overridden from NotificationList::Delegate:
+ virtual void SendRemoveNotification(const std::string& id,
+ bool by_user) OVERRIDE;
+ virtual void SendRemoveAllNotifications(bool by_user) OVERRIDE;
+ virtual void DisableNotificationByExtension(const std::string& id) OVERRIDE;
+ virtual void DisableNotificationByUrl(const std::string& id) OVERRIDE;
+ virtual void ShowNotificationSettings(const std::string& id) OVERRIDE;
+ virtual void ShowNotificationSettingsDialog(gfx::NativeView context) OVERRIDE;
+ virtual void OnNotificationClicked(const std::string& id) OVERRIDE;
+ virtual void OnButtonClicked(const std::string& id,
+ int button_index) OVERRIDE;
+ virtual void OnExpand(const std::string& id) OVERRIDE;
+ virtual void OnQuietModeChanged(bool quiet_mode) OVERRIDE;
+
size_t NumMessageViewsForTest() const;
private:
- MessageCenterContentsView* contents_view_;
+ MessageCenterView* contents_view_;
// The maximum height
int max_height_;

Powered by Google App Engine
This is Rietveld 408576698