summaryrefslogtreecommitdiffstats
path: root/content/public/common/push_messaging_status.h
diff options
context:
space:
mode:
authorpeter <peter@chromium.org>2015-07-24 05:34:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-24 12:35:22 +0000
commit23695aaa72c3c7c5176456c5ca4d3f7617be42fd (patch)
tree954635d0ced9af3bb016454275683c655d7e415e /content/public/common/push_messaging_status.h
parent590c658331bb33404b5831218d110bcd1065f76d (diff)
downloadchromium_src-23695aaa72c3c7c5176456c5ca4d3f7617be42fd.zip
chromium_src-23695aaa72c3c7c5176456c5ca4d3f7617be42fd.tar.gz
chromium_src-23695aaa72c3c7c5176456c5ca4d3f7617be42fd.tar.bz2
Hook up the Push API with GCM's new ability to own encryption keys.
This CL finishes implementing propagation of the "curve25519dh" attribute of the PushSubscription interface of the Push API. The public key will be provided by the GCM Driver, which internally uses the (new) GCMKeyStore. Encrypted messages cannot yet be received by GCM - that work remains. The functionality introduced in this CL is also still guarded behind the "--enable-push-message-payload" command line flag. BUG=486040 Review URL: https://codereview.chromium.org/1231613005 Cr-Commit-Position: refs/heads/master@{#340263}
Diffstat (limited to 'content/public/common/push_messaging_status.h')
-rw-r--r--content/public/common/push_messaging_status.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/public/common/push_messaging_status.h b/content/public/common/push_messaging_status.h
index 2f9f6c1..191c28e 100644
--- a/content/public/common/push_messaging_status.h
+++ b/content/public/common/push_messaging_status.h
@@ -58,7 +58,7 @@ enum PushRegistrationStatus {
// update PUSH_REGISTRATION_STATUS_LAST below.
PUSH_REGISTRATION_STATUS_LAST =
- PUSH_REGISTRATION_STATUS_INCOGNITO_PERMISSION_DENIED
+ PUSH_REGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE
};
// Push unregistration success/error codes for internal use & reporting in UMA.
@@ -124,7 +124,7 @@ enum PushGetRegistrationStatus {
// update PUSH_GETREGISTRATION_STATUS_LAST below.
PUSH_GETREGISTRATION_STATUS_LAST =
- PUSH_GETREGISTRATION_STATUS_INCOGNITO_REGISTRATION_NOT_FOUND
+ PUSH_GETREGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE
};
// Push message event success/error codes for internal use & reporting in UMA.