Made notification center notifications collapsed and expandable.

ui/message_center/message_center.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_MESSAGE_CENTER_MESSAGE_CENTER_H_
 #define UI_MESSAGE_CENTER_MESSAGE_CENTER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/message_center/message_center_export.h"
+#include "ui/message_center/notification_change_observer.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 // Class for managing the NotificationList. The client (e.g. Chrome) calls
 // [Add|Remove|Update]Notification to create and update notifications in the
 // list. It can also implement Delegate to receive callbacks when a
 // notification is removed (closed), or clicked on.
 // If an Observer is provided, it will be informed when the notification list
 // changes, and is expected to handle creating, showing, and hiding of any
 // bubbles.
 
 namespace message_center {
 
-class MESSAGE_CENTER_EXPORT MessageCenter : public NotificationList::Delegate {
+class MESSAGE_CENTER_EXPORT MessageCenter : public NotificationChangeObserver,
+                                            public NotificationList::Delegate {
  public:
   // Creates the global message center object.
   static void Initialize();
 
   // Returns the global message center object. Initialize must be called first.
   static MessageCenter* Get();
 
   // Destroys the global message_center object.
   static void Shutdown();
 
   // Class that hosts the message center.
   class MESSAGE_CENTER_EXPORT Observer {
    public:
     // Called when the notification list has changed. |new_notification| will
     // be true if a notification was added or updated.
     virtual void OnMessageCenterChanged(bool new_notification) = 0;
    protected:
     virtual ~Observer() {}
   };
 
   class MESSAGE_CENTER_EXPORT Delegate {
    public:
+    virtual ~Delegate();
+
     // Called when the notification associated with |notification_id| is
     // removed (i.e. closed by the user).
     virtual void NotificationRemoved(const std::string& notification_id,
                                      bool by_user) = 0;
 
     // Request to disable the extension associated with |notification_id|.
     virtual void DisableExtension(const std::string& notification_id) = 0;
 
     // Request to disable notifications from the source of |notification_id|.
     virtual void DisableNotificationsFromSource(
@@ skipping 10 matching lines @@
     // Called when the notification body is clicked on.
     virtual void OnClicked(const std::string& notification_id) = 0;
 
     // Called when a button in a notification is clicked. |button_index|
     // indicates which button was clicked, zero-indexed (button one is 0,
     // button two is 1).
     //
     // TODO(miket): consider providing default implementations for the pure
     // virtuals above, to avoid changing so many files in disparate parts of
     // the codebase each time we enhance this interface.
-    virtual void OnButtonClicked(const std::string& id, int button_index);
-
-   protected:
-    virtual ~Delegate() {}
+    virtual void OnButtonClicked(const std::string& id, int button_index) = 0;
   };
 
   // Called to set the delegate.  Generally called only once, except in tests.
   // Changing the delegate does not affect notifications in its
   // NotificationList.
   void SetDelegate(Delegate* delegate);
 
   // Management of the observer list.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ skipping 40 matching lines @@
   void SetNotificationImage(const std::string& notification_id,
                             const gfx::Image& image);
 
   void SetNotificationButtonIcon(const std::string& notification_id,
                                  int button_index,
                                  const gfx::Image& image);
 
   NotificationList* notification_list() { return notification_list_.get(); }
   bool quiet_mode() const { return notification_list_->quiet_mode(); }
 
-  // Overridden from NotificationList::Delegate.
+  // 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;
+
+  // 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 OnQuietModeChanged(bool quiet_mode) OVERRIDE;
-  virtual void OnButtonClicked(const std::string& id, int button_index)
-      OVERRIDE;
-  virtual NotificationList* GetNotificationList() OVERRIDE;
 
  protected:
   MessageCenter();
   virtual ~MessageCenter();
 
  private:
   // Calls OnMessageCenterChanged on each observer.
   void NotifyMessageCenterChanged(bool new_notification);
 
   scoped_ptr<NotificationList> notification_list_;
   ObserverList<Observer> observer_list_;
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenter);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_MESSAGE_CENTER_H_