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

Side by Side Diff: ui/message_center/notification.cc

Issue 23462005: Adds the contextMessage field to notifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adjust unit test due to bugfix in toast layout. Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/message_center/notification.h ('k') | ui/message_center/views/notification_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/message_center/notification.h" 5 #include "ui/message_center/notification.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/message_center/notification_delegate.h" 8 #include "ui/message_center/notification_delegate.h"
9 #include "ui/message_center/notification_types.h" 9 #include "ui/message_center/notification_types.h"
10 10
(...skipping 17 matching lines...) Expand all
28 : priority(DEFAULT_PRIORITY), 28 : priority(DEFAULT_PRIORITY),
29 never_timeout(false), 29 never_timeout(false),
30 timestamp(base::Time::Now()), 30 timestamp(base::Time::Now()),
31 progress(0) {} 31 progress(0) {}
32 32
33 RichNotificationData::RichNotificationData(const RichNotificationData& other) 33 RichNotificationData::RichNotificationData(const RichNotificationData& other)
34 : priority(other.priority), 34 : priority(other.priority),
35 never_timeout(other.never_timeout), 35 never_timeout(other.never_timeout),
36 timestamp(other.timestamp), 36 timestamp(other.timestamp),
37 expanded_message(other.expanded_message), 37 expanded_message(other.expanded_message),
38 context_message(other.context_message),
38 image(other.image), 39 image(other.image),
39 items(other.items), 40 items(other.items),
40 progress(other.progress), 41 progress(other.progress),
41 buttons(other.buttons) {} 42 buttons(other.buttons) {}
42 43
43 RichNotificationData::~RichNotificationData() {} 44 RichNotificationData::~RichNotificationData() {}
44 45
45 Notification::Notification(NotificationType type, 46 Notification::Notification(NotificationType type,
46 const std::string& id, 47 const std::string& id,
47 const string16& title, 48 const string16& title,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 icon, 138 icon,
138 base::string16() /* display_source */, 139 base::string16() /* display_source */,
139 NotifierId(system_component_id), 140 NotifierId(system_component_id),
140 RichNotificationData(), 141 RichNotificationData(),
141 new HandleNotificationClickedDelegate(click_callback))); 142 new HandleNotificationClickedDelegate(click_callback)));
142 notification->SetSystemPriority(); 143 notification->SetSystemPriority();
143 return notification.Pass(); 144 return notification.Pass();
144 } 145 }
145 146
146 } // namespace message_center 147 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/notification.h ('k') | ui/message_center/views/notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698