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

Unified Diff: content/common/platform_notification_messages.h

Issue 1634933006: Use NotificationResources instead of a bare SkBitmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 4 years, 11 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 | « content/child/notifications/pending_notifications_tracker.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/platform_notification_messages.h
diff --git a/content/common/platform_notification_messages.h b/content/common/platform_notification_messages.h
index 8b8d7dad421f982392362d5c416eab9ca0b86e7a..db55ac0c5065e3f857ff30a8264b9d71d41e7bf2 100644
--- a/content/common/platform_notification_messages.h
+++ b/content/common/platform_notification_messages.h
@@ -10,6 +10,7 @@
#include <utility>
#include <vector>
+#include "content/public/common/notification_resources.h"
#include "content/public/common/platform_notification_data.h"
#include "ipc/ipc_message_macros.h"
#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationPermission.h"
@@ -54,6 +55,10 @@ IPC_STRUCT_TRAITS_BEGIN(content::PlatformNotificationData)
IPC_STRUCT_TRAITS_MEMBER(actions)
IPC_STRUCT_TRAITS_END()
+IPC_STRUCT_TRAITS_BEGIN(content::NotificationResources)
+ IPC_STRUCT_TRAITS_MEMBER(notification_icon)
+IPC_STRUCT_TRAITS_END()
+
// Messages sent from the browser to the renderer.
// Informs the renderer that the browser has displayed the notification.
@@ -84,18 +89,20 @@ IPC_MESSAGE_CONTROL2(PlatformNotificationMsg_DidGetNotifications,
// Messages sent from the renderer to the browser.
-IPC_MESSAGE_CONTROL4(PlatformNotificationHostMsg_Show,
- int /* notification_id */,
- GURL /* origin */,
- SkBitmap /* icon */,
- content::PlatformNotificationData /* notification_data */)
-
-IPC_MESSAGE_CONTROL5(PlatformNotificationHostMsg_ShowPersistent,
- int /* request_id */,
- int64_t /* service_worker_registration_id */,
- GURL /* origin */,
- SkBitmap /* icon */,
- content::PlatformNotificationData /* notification_data */)
+IPC_MESSAGE_CONTROL4(
+ PlatformNotificationHostMsg_Show,
+ int /* notification_id */,
+ GURL /* origin */,
+ content::PlatformNotificationData /* notification_data */,
+ content::NotificationResources /* notification_resources */)
+
+IPC_MESSAGE_CONTROL5(
+ PlatformNotificationHostMsg_ShowPersistent,
+ int /* request_id */,
+ int64_t /* service_worker_registration_id */,
+ GURL /* origin */,
+ content::PlatformNotificationData /* notification_data */,
+ content::NotificationResources /* notification_resources */)
IPC_MESSAGE_CONTROL4(PlatformNotificationHostMsg_GetNotifications,
int /* request_id */,
« no previous file with comments | « content/child/notifications/pending_notifications_tracker.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698