| 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..8a23b044665dcb9e0829a32a3857569760d0b8f3 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"
|
| @@ -38,6 +39,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(
|
| IPC_STRUCT_TRAITS_BEGIN(content::PlatformNotificationAction)
|
| IPC_STRUCT_TRAITS_MEMBER(action)
|
| IPC_STRUCT_TRAITS_MEMBER(title)
|
| + IPC_STRUCT_TRAITS_MEMBER(icon)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(content::PlatformNotificationData)
|
| @@ -54,6 +56,11 @@ 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_MEMBER(action_icons)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| // Messages sent from the browser to the renderer.
|
|
|
| // Informs the renderer that the browser has displayed the notification.
|
| @@ -84,18 +91,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 */,
|
|
|