Index: blimp/client/app/android/blimp_client_session_android.h |
diff --git a/blimp/client/app/android/blimp_client_session_android.h b/blimp/client/app/android/blimp_client_session_android.h |
index 7ba6d9f64825d5da9cdfcdd4cdd9c4ad9457e636..0eb44564854e60343ec2cd1d3bc1a39b00bd6a79 100644 |
--- a/blimp/client/app/android/blimp_client_session_android.h |
+++ b/blimp/client/app/android/blimp_client_session_android.h |
@@ -20,14 +20,19 @@ class BlimpClientSessionAndroid : public BlimpClientSession { |
static BlimpClientSessionAndroid* FromJavaObject(JNIEnv* env, jobject jobj); |
BlimpClientSessionAndroid(JNIEnv* env, |
- const base::android::JavaParamRef<jobject>& jobj, |
- scoped_ptr<AssignmentSource> assignment_source); |
+ const base::android::JavaParamRef<jobject>& jobj); |
// Methods called from Java via JNI. |
Kevin M
2016/02/12 19:45:26
Document parameters? What's jtoken?
David Trainor- moved to gerrit
2016/02/17 21:09:47
Done.
|
- void Connect(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj); |
+ void Connect(JNIEnv* env, |
+ const base::android::JavaParamRef<jobject>& jobj, |
+ const base::android::JavaParamRef<jstring>& jtoken); |
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj); |
+ // BlimpClientSession overrides. |
+ void ConnectWithAssignment(AssignmentSourceResult result, |
+ const Assignment& assignment) override; |
+ |
private: |
~BlimpClientSessionAndroid() override; |