Upstream version 10.39.225.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 7fcf601..e2f82b0 100644 (file)
--- a/src/chrome/browser/notifications/notification.cc
+++ b/src/chrome/browser/notifications/notification.cc
@@ -4,10 +4,6 @@
 
 #include "chrome/browser/notifications/notification.h"
 
-#include "base/strings/string_util.h"
-#include "chrome/browser/notifications/desktop_notification_service.h"
-#include "ui/base/webui/web_ui_util.h"
-
 Notification::Notification(const GURL& origin_url,
                            const GURL& icon_url,
                            const base::string16& title,
@@ -28,11 +24,7 @@ Notification::Notification(const GURL& origin_url,
       origin_url_(origin_url),
       icon_url_(icon_url),
       replace_id_(replace_id),
-      delegate_(delegate) {
-  // "Upconvert" the string parameters to a data: URL.
-  content_url_ = GURL(DesktopNotificationService::CreateDataUrl(
-      icon_url, title, body, dir));
-}
+      delegate_(delegate) {}
 
 Notification::Notification(
     message_center::NotificationType type,
@@ -62,32 +54,10 @@ Notification::Notification(
   // to prevent "Downloading" the data url and overwriting the existing |icon|.
 }
 
-Notification::Notification(const GURL& origin_url,
-                           const gfx::Image& icon,
-                           const base::string16& title,
-                           const base::string16& body,
-                           blink::WebTextDirection dir,
-                           const base::string16& display_source,
-                           const base::string16& replace_id,
-                           NotificationDelegate* delegate)
-    : message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                   delegate->id(),
-                                   title,
-                                   body,
-                                   icon,
-                                   display_source,
-                                   message_center::NotifierId(origin_url),
-                                   message_center::RichNotificationData(),
-                                   delegate),
-      origin_url_(origin_url),
-      replace_id_(replace_id),
-      delegate_(delegate) {}
-
 Notification::Notification(const Notification& notification)
     : message_center::Notification(notification),
       origin_url_(notification.origin_url()),
       icon_url_(notification.icon_url()),
-      content_url_(notification.content_url()),
       button_one_icon_url_(notification.button_one_icon_url()),
       button_two_icon_url_(notification.button_two_icon_url()),
       image_url_(notification.image_url()),
@@ -100,7 +70,6 @@ Notification& Notification::operator=(const Notification& notification) {
   message_center::Notification::operator=(notification);
   origin_url_ = notification.origin_url();
   icon_url_ = notification.icon_url();
-  content_url_ = notification.content_url();
   button_one_icon_url_ = notification.button_one_icon_url();
   button_two_icon_url_ = notification.button_two_icon_url();
   image_url_ = notification.image_url();