Made notification center notifications collapsed and expandable.

ui/message_center/notification.h

 // Copyright (c) 2013 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_NOTIFICATION_H_
 #define UI_MESSAGE_CENTER_NOTIFICATION_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
   const std::string& extension_id() const { return extension_id_; }
 
   // Begin unpacked values from optional_fields.
   int priority() const { return priority_; }
   base::Time timestamp() const { return timestamp_; }
   const string16& expanded_message() const { return expanded_message_; }
   const std::vector<NotificationItem>& items() const { return items_; }
   // End unpacked values.
 
   // Images fetched asynchronously.
-  const gfx::ImageSkia& primary_icon() const { return primary_icon_; }
-  void set_primary_icon(const gfx::ImageSkia& icon) { primary_icon_ = icon; }
+  const gfx::ImageSkia& icon() const { return icon_; }
+  void set_icon(const gfx::ImageSkia& icon) { icon_ = icon; }
 
   const gfx::ImageSkia& image() const { return image_; }
   void set_image(const gfx::ImageSkia& image) { image_ = image; }
 
   // Buttons, with icons fetched asynchronously.
   const std::vector<ButtonInfo>& buttons() const { return buttons_; }
   bool SetButtonIcon(size_t index, const gfx::ImageSkia& icon);
 
-  // Status in MessageCenter.
-  bool is_read() const { return is_read_; }
-  void set_is_read(bool is_read) { is_read_ = is_read; }
-
   bool shown_as_popup() const { return shown_as_popup_; }
   void set_shown_as_popup(bool shown_as_popup) {
     shown_as_popup_ = shown_as_popup;
   }
 
+  // Read status in the message center.
+  bool is_read() const { return is_read_; }
+  void set_is_read(bool read) { is_read_ = read; }
+
+  // Expanded status in the message center (not the popups).
+  bool is_expanded() const { return is_expanded_; }
+  void set_is_expanded(bool expanded) { is_expanded_ = expanded; }
+
   // Used to keep the order of notifications with the same timestamp.
   // The notification with lesser serial_number is considered 'older'.
   unsigned serial_number() { return serial_number_; }
 
  private:
   // Unpacks the provided |optional_fields| and applies the values to override
   // the notification's data members.
   void ApplyOptionalFields(const DictionaryValue* optional_fields);
 
   NotificationType type_;
   std::string id_;
   string16 title_;
   string16 message_;
   string16 display_source_;
   std::string extension_id_;
   int priority_;
   base::Time timestamp_;
   unsigned serial_number_;
   string16 expanded_message_;
   std::vector<NotificationItem> items_;
-  gfx::ImageSkia primary_icon_;
+  gfx::ImageSkia icon_;

[dharcourt, 2013/03/01 10:17:31]

Cleanup: Since notifications don't have secondary icon any more, the one icon
they do have doesn't need to be described as "primary" :-).

   gfx::ImageSkia image_;
   std::vector<ButtonInfo> buttons_;
+  bool shown_as_popup_;  // True if this has been shown as a popup.
   bool is_read_;  // True if this has been seen in the message center.
-  bool shown_as_popup_;  // True if this has been shown as a popup notification.
+  bool is_expanded_;  // True if this has been expanded in the message center.
 
   DISALLOW_COPY_AND_ASSIGN(Notification);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_NOTIFICATION_H_