diff options
| author | jianli <jianli@chromium.org> | 2015-05-26 16:24:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-26 23:25:26 +0000 |
| commit | 7a0c9b6d322d0a501fc114d3854df944fc059f0f (patch) | |
| tree | ab8af00aaa656b0288ae748f007baa3dfb0c370f /chrome/browser/extensions | |
| parent | 45ab39af3cc293e150158bf06515a47319db9f79 (diff) | |
| download | chromium_src-7a0c9b6d322d0a501fc114d3854df944fc059f0f.zip chromium_src-7a0c9b6d322d0a501fc114d3854df944fc059f0f.tar.gz chromium_src-7a0c9b6d322d0a501fc114d3854df944fc059f0f.tar.bz2 | |
Support getting and deleting token for Instance ID.
GCM's registration and unregistration request have been refactored to
support token requests for Instance ID.
BUG=477084
TEST=new tests
Review URL: https://codereview.chromium.org/1137463003
Cr-Commit-Position: refs/heads/master@{#331475}
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/instance_id/instance_id_api.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/instance_id/instance_id_api.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_api.cc b/chrome/browser/extensions/api/instance_id/instance_id_api.cc index c57b4ed..6707f4c 100644 --- a/chrome/browser/extensions/api/instance_id/instance_id_api.cc +++ b/chrome/browser/extensions/api/instance_id/instance_id_api.cc @@ -19,6 +19,7 @@ namespace { // Error messages. const char kInvalidParameter[] = "Function was called with invalid parameters."; const char kDisabled[] = "Instance ID is currently disabled."; +const char kAsyncOperationPending[] = "Asynchronous operation is pending."; const char kNetworkError[] = "Network error occurred."; const char kServerError[] = "Server error occurred."; const char kUnknownError[] = "Unknown error occurred."; @@ -29,6 +30,8 @@ const char* InstanceIDResultToError(instance_id::InstanceID::Result result) { return kInvalidParameter; case instance_id::InstanceID::DISABLED: return kDisabled; + case instance_id::InstanceID::ASYNC_OPERATION_PENDING: + return kAsyncOperationPending; case instance_id::InstanceID::NETWORK_ERROR: return kNetworkError; case instance_id::InstanceID::SERVER_ERROR: diff --git a/chrome/browser/extensions/api/instance_id/instance_id_api.h b/chrome/browser/extensions/api/instance_id/instance_id_api.h index 6ae1f9d0..4665b47 100644 --- a/chrome/browser/extensions/api/instance_id/instance_id_api.h +++ b/chrome/browser/extensions/api/instance_id/instance_id_api.h @@ -92,7 +92,7 @@ class InstanceIDGetTokenFunction : public InstanceIDApiFunction { class InstanceIDDeleteTokenFunction : public InstanceIDApiFunction { public: - DECLARE_EXTENSION_FUNCTION("instanceID.DeleteToken", INSTANCEID_DELETETOKEN); + DECLARE_EXTENSION_FUNCTION("instanceID.deleteToken", INSTANCEID_DELETETOKEN); InstanceIDDeleteTokenFunction(); |