| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| 11 #include "base/threading/thread_task_runner_handle.h" | 11 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "blimp/client/app/user_agent.h" | 12 #include "blimp/client/app/user_agent.h" |
| 13 #include "blimp/client/core/contents/tab_control_feature.h" | 13 #include "blimp/client/core/contents/tab_control_feature.h" |
| 14 #include "blimp/client/core/session/assignment_source.h" | 14 #include "blimp/client/core/session/assignment_source.h" |
| 15 #include "blimp/client/core/settings/settings_feature.h" | 15 #include "blimp/client/core/settings/settings_feature.h" |
| 16 #include "blimp/net/blimp_stats.h" | 16 #include "blimp/net/blimp_stats.h" |
| 17 #include "components/version_info/version_info.h" | 17 #include "components/version_info/version_info.h" |
| 18 #include "jni/BlimpClientSession_jni.h" | 18 #include "jni/BlimpClientSession_jni.h" |
| 19 #include "net/base/net_errors.h" | 19 #include "net/base/net_errors.h" |
| 20 #include "ui/android/window_android.h" | 20 #include "ui/android/window_android.h" |
| 21 | 21 |
| 22 using base::android::JavaParamRef; | |
| 23 | |
| 24 namespace blimp { | 22 namespace blimp { |
| 25 namespace client { | 23 namespace client { |
| 26 namespace { | 24 namespace { |
| 27 const int kDummyTabId = 0; | 25 const int kDummyTabId = 0; |
| 28 | 26 |
| 29 GURL CreateAssignerGURL(const std::string& assigner_url) { | 27 GURL CreateAssignerGURL(const std::string& assigner_url) { |
| 30 GURL parsed_url(assigner_url); | 28 GURL parsed_url(assigner_url); |
| 31 CHECK(parsed_url.is_valid()); | 29 CHECK(parsed_url.is_valid()); |
| 32 return parsed_url; | 30 return parsed_url; |
| 33 } | 31 } |
| 34 | 32 |
| 35 } // namespace | 33 } // namespace |
| 36 | 34 |
| 37 static jlong Init(JNIEnv* env, | 35 static jlong Init(JNIEnv* env, |
| 38 const JavaParamRef<jobject>& jobj, | 36 const base::android::JavaParamRef<jobject>& jobj, |
| 39 const base::android::JavaParamRef<jstring>& jassigner_url, | 37 const base::android::JavaParamRef<jstring>& jassigner_url, |
| 40 jlong window_android_ptr) { | 38 jlong window_android_ptr) { |
| 41 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid( | 39 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid( |
| 42 env, jobj, jassigner_url, window_android_ptr)); | 40 env, jobj, jassigner_url, window_android_ptr)); |
| 43 } | 41 } |
| 44 | 42 |
| 45 // static | 43 // static |
| 46 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) { | 44 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) { |
| 47 return RegisterNativesImpl(env); | 45 return RegisterNativesImpl(env); |
| 48 } | 46 } |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 Java_BlimpClientSession_onConnected(env, java_obj_); | 98 Java_BlimpClientSession_onConnected(env, java_obj_); |
| 101 } | 99 } |
| 102 | 100 |
| 103 void BlimpClientSessionAndroid::OnDisconnected(int result) { | 101 void BlimpClientSessionAndroid::OnDisconnected(int result) { |
| 104 JNIEnv* env = base::android::AttachCurrentThread(); | 102 JNIEnv* env = base::android::AttachCurrentThread(); |
| 105 Java_BlimpClientSession_onDisconnected( | 103 Java_BlimpClientSession_onDisconnected( |
| 106 env, java_obj_, base::android::ConvertUTF8ToJavaString( | 104 env, java_obj_, base::android::ConvertUTF8ToJavaString( |
| 107 env, net::ErrorToShortString(result))); | 105 env, net::ErrorToShortString(result))); |
| 108 } | 106 } |
| 109 | 107 |
| 110 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, | 108 void BlimpClientSessionAndroid::Destroy( |
| 111 const JavaParamRef<jobject>& jobj) { | 109 JNIEnv* env, |
| 110 const base::android::JavaParamRef<jobject>& jobj) { |
| 112 delete this; | 111 delete this; |
| 113 } | 112 } |
| 114 | 113 |
| 115 void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted( | 114 void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted( |
| 116 AssignmentRequestResult result, | 115 AssignmentRequestResult result, |
| 117 const Assignment& assignment) { | 116 const Assignment& assignment) { |
| 118 // Notify the front end of the assignment result. | 117 // Notify the front end of the assignment result. |
| 119 std::string engine_ip = IPAddressToStringWithPort( | 118 std::string engine_ip = IPAddressToStringWithPort( |
| 120 assignment.engine_endpoint.address(), assignment.engine_endpoint.port()); | 119 assignment.engine_endpoint.address(), assignment.engine_endpoint.port()); |
| 121 JNIEnv* env = base::android::AttachCurrentThread(); | 120 JNIEnv* env = base::android::AttachCurrentThread(); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 134 const base::android::JavaParamRef<jobject>& jobj) { | 133 const base::android::JavaParamRef<jobject>& jobj) { |
| 135 BlimpStats* stats = BlimpStats::GetInstance(); | 134 BlimpStats* stats = BlimpStats::GetInstance(); |
| 136 int metrics[] = {stats->Get(BlimpStats::BYTES_RECEIVED), | 135 int metrics[] = {stats->Get(BlimpStats::BYTES_RECEIVED), |
| 137 stats->Get(BlimpStats::BYTES_SENT), | 136 stats->Get(BlimpStats::BYTES_SENT), |
| 138 stats->Get(BlimpStats::COMMIT)}; | 137 stats->Get(BlimpStats::COMMIT)}; |
| 139 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); | 138 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); |
| 140 } | 139 } |
| 141 | 140 |
| 142 } // namespace client | 141 } // namespace client |
| 143 } // namespace blimp | 142 } // namespace blimp |
| OLD | NEW |