chrome/browser/push_messaging/push_messaging_service_impl.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: chrome/browser/push_messaging/push_messaging_service_impl.h

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

Patch Set: Added testing and integrated previous comments. 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

« no previous file with comments | « chrome/browser/push_messaging/push_messaging_browsertest.cc ('k') | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('j') | chrome/test/data/push_messaging/push_test.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_service_impl.h

diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h

index 449154b9426a8e321279616975b9bf8ce2507d54..b713dee176597f67db6dd1c950ef28f123f58591 100644

--- a/chrome/browser/push_messaging/push_messaging_service_impl.h

+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h

@@ -26,6 +26,7 @@

#include "content/public/common/permission_status.mojom.h"

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

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

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

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

#if defined(ENABLE_NOTIFICATIONS)

@@ -74,16 +75,14 @@ class PushMessagingServiceImpl : public content::PushMessagingService,

void SubscribeFromDocument(

const GURL& requesting_origin,

int64_t service_worker_registration_id,

- const std::string& sender_id,

int renderer_id,

int render_frame_id,

- bool user_visible,

+ const content::PushSubscriptionOptions& options,

const content::PushMessagingService::RegisterCallback& callback) override;

void SubscribeFromWorker(

const GURL& requesting_origin,

int64_t service_worker_registration_id,

- const std::string& sender_id,

- bool user_visible,

+ const content::PushSubscriptionOptions& options,

const content::PushMessagingService::RegisterCallback& callback) override;

void GetEncryptionInfo(

const GURL& origin,

@@ -166,7 +165,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService,

void DidRequestPermission(

const PushMessagingAppIdentifier& app_identifier,

- const std::string& sender_id,

+ const content::PushSubscriptionOptions& options,

const content::PushMessagingService::RegisterCallback& callback,

content::PermissionStatus permission_status);