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

Unified Diff: components/gcm_driver/instance_id/instance_id_android.h

Issue 1899753002: Make InstanceIDBridge fully async to fix strict mode violations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid3test
Patch Set: Disallow synchronous delete from callbacks Created 4 years, 8 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: components/gcm_driver/instance_id/instance_id_android.h
diff --git a/components/gcm_driver/instance_id/instance_id_android.h b/components/gcm_driver/instance_id/instance_id_android.h
index c5cce21ef01f0f05d29388a860655ee8a51953be..4b4deff17f9e8dc91eac41244601114849c0f8ec 100644
--- a/components/gcm_driver/instance_id/instance_id_android.h
+++ b/components/gcm_driver/instance_id/instance_id_android.h
@@ -56,6 +56,14 @@ class InstanceIDAndroid : public InstanceID {
void DeleteID(const DeleteIDCallback& callback) override;
// Methods called from Java via JNI:
+ void DidGetID(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jint request_id,
+ const base::android::JavaParamRef<jstring>& jid);
+ void DidGetCreationTime(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jint request_id,
+ jlong creation_time_unix_ms);
void DidGetToken(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
jint request_id,
@@ -72,6 +80,8 @@ class InstanceIDAndroid : public InstanceID {
private:
base::android::ScopedJavaGlobalRef<jobject> java_ref_;
+ IDMap<GetIDCallback, IDMapOwnPointer> get_id_callbacks_;
+ IDMap<GetCreationTimeCallback, IDMapOwnPointer> get_creation_time_callbacks_;
IDMap<GetTokenCallback, IDMapOwnPointer> get_token_callbacks_;
IDMap<DeleteTokenCallback, IDMapOwnPointer> delete_token_callbacks_;
IDMap<DeleteIDCallback, IDMapOwnPointer> delete_id_callbacks_;

Powered by Google App Engine
This is Rietveld 408576698