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

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: Fixed manually run message_center unit test. 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..fdda111b85aaa3d7d146dc91705c038fd8e46d71 100644
--- a/ui/message_center/message_center_bubble.h
+++ b/ui/message_center/message_center_bubble.h
@@ -7,20 +7,22 @@
#include "ui/message_center/message_bubble_base.h"
#include "ui/message_center/message_center_export.h"
-#include "ui/message_center/notification_list.h"
+#include "ui/message_center/notification_change_observer.h"
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 NotificationChangeObserver {
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,25 @@ class MESSAGE_CENTER_EXPORT MessageCenterBubble : public MessageBubbleBase {
virtual void OnMouseEnteredView() OVERRIDE;
virtual void OnMouseExitedView() OVERRIDE;
+ // Overridden from NotificationChangeObserver:
+ virtual void OnRemoveNotification(const std::string& id, bool by_user)
+ OVERRIDE;
+ virtual void OnRemoveAllNotifications(bool by_user) OVERRIDE;
+ virtual void OnDisableNotificationsByExtension(const std::string& id)
+ OVERRIDE;
+ virtual void OnDisableNotificationsByUrl(const std::string& id) OVERRIDE;
+ virtual void OnShowNotificationSettings(const std::string& id) OVERRIDE;
+ virtual void OnShowNotificationSettingsDialog(gfx::NativeView context)
+ OVERRIDE;
+ virtual void OnExpanded(const std::string& id) OVERRIDE;
+ virtual void OnClicked(const std::string& id) OVERRIDE;
+ virtual void OnButtonClicked(const std::string& id,
+ int button_index) 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