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

Side by Side 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, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_ 5 #ifndef COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
6 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_ 6 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void GetToken(const std::string& audience, 49 void GetToken(const std::string& audience,
50 const std::string& scope, 50 const std::string& scope,
51 const std::map<std::string, std::string>& options, 51 const std::map<std::string, std::string>& options,
52 const GetTokenCallback& callback) override; 52 const GetTokenCallback& callback) override;
53 void DeleteToken(const std::string& audience, 53 void DeleteToken(const std::string& audience,
54 const std::string& scope, 54 const std::string& scope,
55 const DeleteTokenCallback& callback) override; 55 const DeleteTokenCallback& callback) override;
56 void DeleteID(const DeleteIDCallback& callback) override; 56 void DeleteID(const DeleteIDCallback& callback) override;
57 57
58 // Methods called from Java via JNI: 58 // Methods called from Java via JNI:
59 void DidGetID(JNIEnv* env,
60 const base::android::JavaParamRef<jobject>& obj,
61 jint request_id,
62 const base::android::JavaParamRef<jstring>& jid);
63 void DidGetCreationTime(JNIEnv* env,
64 const base::android::JavaParamRef<jobject>& obj,
65 jint request_id,
66 jlong creation_time_unix_ms);
59 void DidGetToken(JNIEnv* env, 67 void DidGetToken(JNIEnv* env,
60 const base::android::JavaParamRef<jobject>& obj, 68 const base::android::JavaParamRef<jobject>& obj,
61 jint request_id, 69 jint request_id,
62 const base::android::JavaParamRef<jstring>& jtoken); 70 const base::android::JavaParamRef<jstring>& jtoken);
63 void DidDeleteToken(JNIEnv* env, 71 void DidDeleteToken(JNIEnv* env,
64 const base::android::JavaParamRef<jobject>& obj, 72 const base::android::JavaParamRef<jobject>& obj,
65 jint request_id, 73 jint request_id,
66 jboolean success); 74 jboolean success);
67 void DidDeleteID(JNIEnv* env, 75 void DidDeleteID(JNIEnv* env,
68 const base::android::JavaParamRef<jobject>& obj, 76 const base::android::JavaParamRef<jobject>& obj,
69 jint request_id, 77 jint request_id,
70 jboolean success); 78 jboolean success);
71 79
72 private: 80 private:
73 base::android::ScopedJavaGlobalRef<jobject> java_ref_; 81 base::android::ScopedJavaGlobalRef<jobject> java_ref_;
74 82
83 IDMap<GetIDCallback, IDMapOwnPointer> get_id_callbacks_;
84 IDMap<GetCreationTimeCallback, IDMapOwnPointer> get_creation_time_callbacks_;
75 IDMap<GetTokenCallback, IDMapOwnPointer> get_token_callbacks_; 85 IDMap<GetTokenCallback, IDMapOwnPointer> get_token_callbacks_;
76 IDMap<DeleteTokenCallback, IDMapOwnPointer> delete_token_callbacks_; 86 IDMap<DeleteTokenCallback, IDMapOwnPointer> delete_token_callbacks_;
77 IDMap<DeleteIDCallback, IDMapOwnPointer> delete_id_callbacks_; 87 IDMap<DeleteIDCallback, IDMapOwnPointer> delete_id_callbacks_;
78 88
79 base::ThreadChecker thread_checker_; 89 base::ThreadChecker thread_checker_;
80 90
81 DISALLOW_COPY_AND_ASSIGN(InstanceIDAndroid); 91 DISALLOW_COPY_AND_ASSIGN(InstanceIDAndroid);
82 }; 92 };
83 93
84 } // namespace instance_id 94 } // namespace instance_id
85 95
86 #endif // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_ 96 #endif // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698