OLD | NEW |
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 #include "blimp/client/app/android/blimp_client_session_android.h" | 5 #include "blimp/client/app/android/blimp_client_session_android.h" |
6 | 6 |
| 7 #include "base/android/jni_string.h" |
| 8 #include "base/android/scoped_java_ref.h" |
7 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
8 #include "blimp/client/feature/tab_control_feature.h" | 10 #include "blimp/client/feature/tab_control_feature.h" |
9 #include "blimp/client/session/assignment_source.h" | 11 #include "blimp/client/session/assignment_source.h" |
10 #include "jni/BlimpClientSession_jni.h" | 12 #include "jni/BlimpClientSession_jni.h" |
11 | 13 |
12 namespace blimp { | 14 namespace blimp { |
13 namespace client { | 15 namespace client { |
14 namespace { | 16 namespace { |
15 const int kDummyTabId = 0; | 17 const int kDummyTabId = 0; |
16 } // namespace | 18 } // namespace |
17 | 19 |
18 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { | 20 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
19 scoped_ptr<AssignmentSource> assignment_source = make_scoped_ptr( | 21 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(env, jobj)); |
20 new AssignmentSource(base::ThreadTaskRunnerHandle::Get())); | |
21 return reinterpret_cast<intptr_t>( | |
22 new BlimpClientSessionAndroid(env, jobj, std::move(assignment_source))); | |
23 } | 22 } |
24 | 23 |
25 // static | 24 // static |
26 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) { | 25 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) { |
27 return RegisterNativesImpl(env); | 26 return RegisterNativesImpl(env); |
28 } | 27 } |
29 | 28 |
30 // static | 29 // static |
31 BlimpClientSessionAndroid* BlimpClientSessionAndroid::FromJavaObject( | 30 BlimpClientSessionAndroid* BlimpClientSessionAndroid::FromJavaObject( |
32 JNIEnv* env, | 31 JNIEnv* env, |
33 jobject jobj) { | 32 jobject jobj) { |
34 return reinterpret_cast<BlimpClientSessionAndroid*>( | 33 return reinterpret_cast<BlimpClientSessionAndroid*>( |
35 Java_BlimpClientSession_getNativePtr(env, jobj)); | 34 Java_BlimpClientSession_getNativePtr(env, jobj)); |
36 } | 35 } |
37 | 36 |
38 BlimpClientSessionAndroid::BlimpClientSessionAndroid( | 37 BlimpClientSessionAndroid::BlimpClientSessionAndroid( |
39 JNIEnv* env, | 38 JNIEnv* env, |
40 const base::android::JavaParamRef<jobject>& jobj, | 39 const base::android::JavaParamRef<jobject>& jobj) { |
41 scoped_ptr<AssignmentSource> assignment_source) | |
42 : BlimpClientSession(std::move(assignment_source)) { | |
43 java_obj_.Reset(env, jobj); | 40 java_obj_.Reset(env, jobj); |
44 | 41 |
45 // Create a single tab's WebContents. | 42 // Create a single tab's WebContents. |
46 // TODO(kmarshall): Remove this once we add tab-literacy to Blimp. | 43 // TODO(kmarshall): Remove this once we add tab-literacy to Blimp. |
47 GetTabControlFeature()->CreateTab(kDummyTabId); | 44 GetTabControlFeature()->CreateTab(kDummyTabId); |
48 } | 45 } |
49 | 46 |
50 void BlimpClientSessionAndroid::Connect( | 47 void BlimpClientSessionAndroid::Connect( |
51 JNIEnv* env, | 48 JNIEnv* env, |
52 const base::android::JavaParamRef<jobject>& jobj) { | 49 const base::android::JavaParamRef<jobject>& jobj, |
53 BlimpClientSession::Connect(); | 50 const base::android::JavaParamRef<jstring>& jclient_auth_token) { |
| 51 std::string client_auth_token; |
| 52 if (jclient_auth_token.obj()) { |
| 53 client_auth_token = |
| 54 base::android::ConvertJavaStringToUTF8(env, jclient_auth_token); |
| 55 } |
| 56 |
| 57 BlimpClientSession::Connect(client_auth_token); |
54 } | 58 } |
55 | 59 |
56 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} | 60 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} |
57 | 61 |
58 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, | 62 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, |
59 const JavaParamRef<jobject>& jobj) { | 63 const JavaParamRef<jobject>& jobj) { |
60 delete this; | 64 delete this; |
61 } | 65 } |
62 | 66 |
| 67 void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted( |
| 68 AssignmentSource::Result result) { |
| 69 // Notify the front end of the assignment result. |
| 70 JNIEnv* env = base::android::AttachCurrentThread(); |
| 71 Java_BlimpClientSession_onAssignmentReceived(env, java_obj_.obj(), |
| 72 static_cast<jint>(result)); |
| 73 |
| 74 BlimpClientSession::OnAssignmentConnectionAttempted(result); |
| 75 } |
| 76 |
63 } // namespace client | 77 } // namespace client |
64 } // namespace blimp | 78 } // namespace blimp |
OLD | NEW |