| Index: chrome/browser/notifications/notification.cc
|
| diff --git a/chrome/browser/notifications/notification.cc b/chrome/browser/notifications/notification.cc
|
| index e2f82b06ea6949c2c40f81be87a26a7d41fded16..a515d703e0ee41890f5204c35c75699a5b4a4e40 100644
|
| --- a/chrome/browser/notifications/notification.cc
|
| +++ b/chrome/browser/notifications/notification.cc
|
| @@ -4,28 +4,6 @@
|
|
|
| #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 base::string16& display_source,
|
| - const base::string16& replace_id,
|
| - NotificationDelegate* delegate)
|
| - : message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
|
| - delegate->id(),
|
| - title,
|
| - body,
|
| - gfx::Image(),
|
| - 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) {}
|
| -
|
| Notification::Notification(
|
| message_center::NotificationType type,
|
| const GURL& origin_url,
|
| @@ -49,15 +27,11 @@ 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 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()),
|
| @@ -69,7 +43,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();
|
|
|