content/common/push_messaging_messages.h - Issue 1701313002: Partial implementation of subscription restrictions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/push_messaging_messages.h

Issue 1701313002: Partial implementation of subscription restrictions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added exception failure return and updated more tests Created 4 years, 10 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

« content/browser/push_messaging/push_messaging_message_filter.cc ('K') | « content/child/push_messaging/push_provider.cc ('k') | content/public/browser/push_messaging_service.h » ('j') | content/shell/browser/layout_test/layout_test_push_messaging_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/push_messaging_messages.h

diff --git a/content/common/push_messaging_messages.h b/content/common/push_messaging_messages.h

index 38a39e8cb116d50dbbccae7ea190e878ed52588f..df88b2f2a552f86ab65fa25563af10b709b9247a 100644

--- a/content/common/push_messaging_messages.h

+++ b/content/common/push_messaging_messages.h

@@ -8,6 +8,7 @@

#include <stdint.h>

#include "content/public/common/push_messaging_status.h"

+#include "content/public/common/push_subscription_options.h"

#include "ipc/ipc_message_macros.h"

#include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"

#include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"

@@ -29,6 +30,11 @@ IPC_ENUM_TRAITS_MAX_VALUE(

blink::WebPushError::ErrorType,

blink::WebPushError::ErrorType::ErrorTypeLast)

+IPC_STRUCT_TRAITS_BEGIN(content::PushSubscriptionOptions)

+ IPC_STRUCT_TRAITS_MEMBER(user_visible_only)

+ IPC_STRUCT_TRAITS_MEMBER(sender_info)

+IPC_STRUCT_TRAITS_END()

// Messages sent from the browser to the child process.

IPC_MESSAGE_ROUTED4(PushMessagingMsg_SubscribeFromDocumentSuccess,

@@ -80,17 +86,16 @@ IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetPermissionStatusError,

// Messages sent from the child process to the browser.

-IPC_MESSAGE_CONTROL5(PushMessagingHostMsg_SubscribeFromDocument,

+IPC_MESSAGE_CONTROL4(PushMessagingHostMsg_SubscribeFromDocument,

int32_t /* render_frame_id */,

int32_t /* request_id */,

- std::string /* sender_id */,

- bool /* user_visible */,

+ content::PushSubscriptionOptions /* options */,

int64_t /* service_worker_registration_id */)

IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_SubscribeFromWorker,

int32_t /* request_id */,

int64_t /* service_worker_registration_id */,

- bool /* user_visible */)

+ content::PushSubscriptionOptions /* options */)

IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unsubscribe,

int32_t /* request_id */,