Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / notifications / notification.cc

diff --git a/src/chrome/browser/notifications/notification.cc b/src/chrome/browser/notifications/notification.cc
index e2f82b0..d182c6b 100644 (file)
--- a/src/chrome/browser/notifications/notification.cc
+++ b/src/chrome/browser/notifications/notification.cc
@@ -5,10 +5,9 @@
 #include "chrome/browser/notifications/notification.h"
 
 Notification::Notification(const GURL& origin_url,
-                           const GURL& icon_url,
                            const base::string16& title,
                            const base::string16& body,
-                           blink::WebTextDirection dir,
+                           const gfx::Image& icon,
                            const base::string16& display_source,
                            const base::string16& replace_id,
                            NotificationDelegate* delegate)
@@ -16,13 +15,12 @@ Notification::Notification(const GURL& origin_url,
                                    delegate->id(),
                                    title,
                                    body,
-                                   gfx::Image(),
+                                   icon,
                                    display_source,
                                    message_center::NotifierId(origin_url),
                                    message_center::RichNotificationData(),
                                    delegate),
       origin_url_(origin_url),
-      icon_url_(icon_url),
       replace_id_(replace_id),
       delegate_(delegate) {}
 
@@ -49,18 +47,19 @@ Notification::Notification(
                                    delegate),
       origin_url_(origin_url),
       replace_id_(replace_id),
-      delegate_(delegate) {
-  // It's important to leave |icon_url_| empty with rich notifications enabled,
-  // to prevent "Downloading" the data url and overwriting the existing |icon|.
+      delegate_(delegate) {}
+
+Notification::Notification(const std::string& id,
+                           const Notification& notification)
+    : message_center::Notification(id, notification),
+      origin_url_(notification.origin_url()),
+      replace_id_(notification.replace_id()),
+      delegate_(notification.delegate()) {
 }
 
 Notification::Notification(const Notification& notification)
     : message_center::Notification(notification),
       origin_url_(notification.origin_url()),
-      icon_url_(notification.icon_url()),
-      button_one_icon_url_(notification.button_one_icon_url()),
-      button_two_icon_url_(notification.button_two_icon_url()),
-      image_url_(notification.image_url()),
       replace_id_(notification.replace_id()),
       delegate_(notification.delegate()) {}
 
@@ -69,10 +68,6 @@ Notification::~Notification() {}
 Notification& Notification::operator=(const Notification& notification) {
   message_center::Notification::operator=(notification);
   origin_url_ = notification.origin_url();
-  icon_url_ = notification.icon_url();
-  button_one_icon_url_ = notification.button_one_icon_url();
-  button_two_icon_url_ = notification.button_two_icon_url();
-  image_url_ = notification.image_url();
   replace_id_ = notification.replace_id();
   delegate_ = notification.delegate();
   return *this;