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

Unified Diff: content/browser/push_messaging/push_messaging_message_filter.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
Index: content/browser/push_messaging/push_messaging_message_filter.h
diff --git a/content/browser/push_messaging/push_messaging_message_filter.h b/content/browser/push_messaging/push_messaging_message_filter.h
index 9dd96f028afcd2f5137cd89a1ded6405d63304f9..c95d4772ed2ec61495424888ab5db700be5a4b19 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -73,17 +73,24 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
const std::string& push_registration_id,
ServiceWorkerStatusCode service_worker_status);
+ void DidGetEncryptionKeys(const RegisterData& data,
+ const std::string& push_registration_id,
+ bool success,
+ const std::vector<uint8_t>& curve25519dh);
+
void DidGetSenderIdFromStorage(const RegisterData& data,
const std::string& sender_id,
ServiceWorkerStatusCode service_worker_status);
// Called via PostTask from UI thread.
void PersistRegistrationOnIO(const RegisterData& data,
- const std::string& push_registration_id);
+ const std::string& push_registration_id,
+ const std::vector<uint8_t>& curve25519dh);
void DidPersistRegistrationOnIO(
const RegisterData& data,
const std::string& push_registration_id,
+ const std::vector<uint8_t>& curve25519dh,
ServiceWorkerStatusCode service_worker_status);
// Called both from IO thread, and via PostTask from UI thread.
@@ -92,7 +99,8 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
// Called both from IO thread, and via PostTask from UI thread.
void SendRegisterSuccess(const RegisterData& data,
PushRegistrationStatus status,
- const std::string& push_registration_id);
+ const std::string& push_registration_id,
+ const std::vector<uint8_t>& curve25519dh);
// Unsubscribe methods on IO thread ------------------------------------------
@@ -131,6 +139,7 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
int64_t service_worker_registration_id);
void DidGetRegistration(int request_id,
+ int64_t service_worker_registration_id,
const std::string& push_registration_id,
ServiceWorkerStatusCode status);
@@ -140,6 +149,11 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
int64_t service_worker_registration_id,
bool user_visible);
+ void DidGetRegistrationKeys(int request_id,
+ const GURL& endpoint,
+ bool success,
+ const std::vector<uint8_t>& curve25519dh);
+
// Helper methods on IO thread -----------------------------------------------
// Called via PostTask from UI thread.

Powered by Google App Engine
This is Rietveld 408576698