Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / message_center / notification.h

diff --git a/src/ui/message_center/notification.h b/src/ui/message_center/notification.h
index 2e151b3..a0bc853 100644 (file)
--- a/src/ui/message_center/notification.h
+++ b/src/ui/message_center/notification.h
@@ -42,9 +42,9 @@ class MESSAGE_CENTER_EXPORT RichNotificationData {
   int priority;
   bool never_timeout;
   base::Time timestamp;
-  base::string16 expanded_message;
   base::string16 context_message;
   gfx::Image image;
+  gfx::Image small_image;
   std::vector<NotificationItem> items;
   int progress;
   std::vector<ButtonInfo> buttons;
@@ -69,7 +69,7 @@ class MESSAGE_CENTER_EXPORT Notification {
   virtual ~Notification();
 
   // Copies the internal on-memory state from |base|, i.e. shown_as_popup,
-  // is_read, is_expanded, and never_timeout.
+  // is_read, and never_timeout.
   void CopyState(Notification* base);
 
   NotificationType type() const { return type_; }
@@ -101,13 +101,6 @@ class MESSAGE_CENTER_EXPORT Notification {
     optional_fields_.timestamp = timestamp;
   }
 
-  const base::string16& expanded_message() const {
-    return optional_fields_.expanded_message;
-  }
-  void set_expanded_message(const base::string16& expanded_message) {
-    optional_fields_.expanded_message = expanded_message;
-  }
-
   const base::string16& context_message() const {
     return optional_fields_.context_message;
   }
@@ -133,6 +126,11 @@ class MESSAGE_CENTER_EXPORT Notification {
   const gfx::Image& image() const { return optional_fields_.image; }
   void set_image(const gfx::Image& image) { optional_fields_.image = image; }
 
+  const gfx::Image& small_image() const { return optional_fields_.small_image; }
+  void set_small_image(const gfx::Image& image) {
+    optional_fields_.small_image = image;
+  }
+
   // Buttons, with icons fetched asynchronously.
   const std::vector<ButtonInfo>& buttons() const {
     return optional_fields_.buttons;
@@ -151,10 +149,6 @@ class MESSAGE_CENTER_EXPORT Notification {
   bool IsRead() const;
   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_; }
@@ -221,7 +215,6 @@ class MESSAGE_CENTER_EXPORT Notification {
   RichNotificationData optional_fields_;
   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 is_expanded_;  // True if this has been expanded in the message center.
 
   // A proxy object that allows access back to the JavaScript object that
   // represents the notification, for firing events.