| 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..614651cff5aa5f5532efb4a07ba3771022e748a6 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 ------------------------------------------
|
|
|
| @@ -128,9 +136,12 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
|
| // GetRegistration methods on IO thread --------------------------------------
|
|
|
| void OnGetRegistration(int request_id,
|
| + const GURL& origin,
|
| int64_t service_worker_registration_id);
|
|
|
| void DidGetRegistration(int request_id,
|
| + const GURL& origin,
|
| + int64_t service_worker_registration_id,
|
| const std::string& push_registration_id,
|
| ServiceWorkerStatusCode status);
|
|
|
| @@ -140,6 +151,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.
|
|
|