Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2009)

Unified Diff: chrome/browser/notifications/notification.cc

Issue 10537158: Add support for Ash to Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo accidental UserManagerImpl change Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/notifications/notification.h ('k') | chrome/browser/notifications/notification_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/notifications/notification.cc
diff --git a/chrome/browser/notifications/notification.cc b/chrome/browser/notifications/notification.cc
index 8af6ba132c49f746677d6b10fe216858058c4530..282ccbdb877e7aba46492301cf5506e76a429147 100644
--- a/chrome/browser/notifications/notification.cc
+++ b/chrome/browser/notifications/notification.cc
@@ -28,6 +28,7 @@ Notification::Notification(const GURL& origin_url,
const string16& replace_id,
NotificationDelegate* delegate)
: origin_url_(origin_url),
+ icon_url_(icon_url),
is_html_(false),
title_(title),
body_(body),
@@ -39,8 +40,28 @@ Notification::Notification(const GURL& origin_url,
icon_url, title, body, dir));
}
+Notification::Notification(const GURL& origin_url,
+ const gfx::ImageSkia& icon,
+ const string16& title,
+ const string16& body,
+ WebKit::WebTextDirection dir,
+ const string16& display_source,
+ const string16& replace_id,
+ NotificationDelegate* delegate)
+ : origin_url_(origin_url),
+ icon_(icon),
+ is_html_(false),
+ title_(title),
+ body_(body),
+ display_source_(display_source),
+ replace_id_(replace_id),
+ delegate_(delegate) {
+}
+
Notification::Notification(const Notification& notification)
: origin_url_(notification.origin_url()),
+ icon_(notification.icon()),
+ icon_url_(notification.icon_url()),
is_html_(notification.is_html()),
content_url_(notification.content_url()),
title_(notification.title()),
@@ -54,6 +75,8 @@ Notification::~Notification() {}
Notification& Notification::operator=(const Notification& notification) {
origin_url_ = notification.origin_url();
+ icon_ = notification.icon_;
+ icon_url_ = notification.icon_url();
is_html_ = notification.is_html();
content_url_ = notification.content_url();
title_ = notification.title();
« no previous file with comments | « chrome/browser/notifications/notification.h ('k') | chrome/browser/notifications/notification_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698