third_party/WebKit/Source/modules/push_messaging/PushManager.cpp - 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: third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

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

Patch Set: Fixed broken file 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/renderer/push_messaging/push_messaging_dispatcher.cc ('K') | « content/renderer/push_messaging/push_messaging_dispatcher.cc ('k') | third_party/WebKit/Source/modules/push_messaging/PushSubscriptionOptions.idl » ('j') | third_party/WebKit/Source/modules/push_messaging/PushSubscriptionOptions.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

diff --git a/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp b/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

index 0f5a2ffd66ddd641444c5580ef3b4c3273ccc98d..9b9053e207071759f8b114655dd92249b0650433 100644

--- a/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

+++ b/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

@@ -38,6 +38,11 @@ WebPushSubscriptionOptions toWebPushSubscriptionOptions(const PushSubscriptionOp

{

WebPushSubscriptionOptions webOptions;

webOptions.userVisibleOnly = options.userVisibleOnly();

+ if (options.hasApplicationServerKey() && options.applicationServerKey()) {

+ webOptions.applicationServerKey = WebString::fromUTF8(

+ static_cast<const char*>(options.applicationServerKey()->data()),

+ options.applicationServerKey()->byteLength());

+ }

return webOptions;

}