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

Unified Diff: chrome/browser/push_messaging/push_messaging_service_impl.h

Issue 1210283005: Introduce the PushSubscription.curve25519dh attribute (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android fix 2 Created 5 years, 5 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 | « no previous file | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 7a1c69c754084d797cb32e57bc6e95c7da864763..333497c2725b5e76160cd1ab956befc55ba6c42d 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -7,6 +7,7 @@
#include <stdint.h>
#include <set>
+#include <vector>
#include "base/callback.h"
#include "base/compiler_specific.h"
@@ -68,7 +69,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
GURL GetPushEndpoint() override;
void SubscribeFromDocument(
const GURL& requesting_origin,
- int64 service_worker_registration_id,
+ int64_t service_worker_registration_id,
const std::string& sender_id,
int renderer_id,
int render_frame_id,
@@ -76,13 +77,18 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
const content::PushMessagingService::RegisterCallback& callback) override;
void SubscribeFromWorker(
const GURL& requesting_origin,
- int64 service_worker_registration_id,
+ int64_t service_worker_registration_id,
const std::string& sender_id,
bool user_visible,
const content::PushMessagingService::RegisterCallback& callback) override;
+ void GetPublicEncryptionKey(
+ const GURL& origin,
+ int64_t service_worker_registration_id,
+ const content::PushMessagingService::PublicKeyCallback&
+ callback) override;
void Unsubscribe(
const GURL& requesting_origin,
- int64 service_worker_registration_id,
+ int64_t service_worker_registration_id,
const std::string& sender_id,
const content::PushMessagingService::UnregisterCallback&) override;
blink::WebPushPermissionStatus GetPermissionStatus(
@@ -124,6 +130,11 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
void SubscribeEnd(
const content::PushMessagingService::RegisterCallback& callback,
const std::string& subscription_id,
+ const std::vector<uint8_t>& curve25519dh,
+ content::PushRegistrationStatus status);
+
+ void SubscribeEndWithError(
+ const content::PushMessagingService::RegisterCallback& callback,
content::PushRegistrationStatus status);
void DidSubscribe(
« no previous file with comments | « no previous file | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698