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/feature/settings_feature.h" | 13 #include "blimp/client/feature/settings_feature.h" |
14 #include "blimp/client/feature/tab_control_feature.h" | 14 #include "blimp/client/feature/tab_control_feature.h" |
15 #include "blimp/client/session/assignment_source.h" | 15 #include "blimp/client/session/assignment_source.h" |
16 #include "blimp/common/protocol_version.h" | 16 #include "components/version_info/version_info.h" |
17 #include "jni/BlimpClientSession_jni.h" | 17 #include "jni/BlimpClientSession_jni.h" |
18 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
19 | 19 |
20 namespace blimp { | 20 namespace blimp { |
21 namespace client { | 21 namespace client { |
22 namespace { | 22 namespace { |
23 const int kDummyTabId = 0; | 23 const int kDummyTabId = 0; |
24 | 24 |
25 GURL CreateAssignerGURL(const std::string& assigner_url) { | 25 GURL CreateAssignerGURL(const std::string& assigner_url) { |
26 GURL parsed_url(assigner_url); | 26 GURL parsed_url(assigner_url); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted( | 102 void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted( |
103 AssignmentSource::Result result, | 103 AssignmentSource::Result result, |
104 const Assignment& assignment) { | 104 const Assignment& assignment) { |
105 // Notify the front end of the assignment result. | 105 // Notify the front end of the assignment result. |
106 std::string engine_ip = IPAddressToStringWithPort( | 106 std::string engine_ip = IPAddressToStringWithPort( |
107 assignment.engine_endpoint.address(), assignment.engine_endpoint.port()); | 107 assignment.engine_endpoint.address(), assignment.engine_endpoint.port()); |
108 JNIEnv* env = base::android::AttachCurrentThread(); | 108 JNIEnv* env = base::android::AttachCurrentThread(); |
109 Java_BlimpClientSession_onAssignmentReceived( | 109 Java_BlimpClientSession_onAssignmentReceived( |
110 env, java_obj_.obj(), static_cast<jint>(result), | 110 env, java_obj_.obj(), static_cast<jint>(result), |
111 base::android::ConvertUTF8ToJavaString(env, engine_ip).obj(), | 111 base::android::ConvertUTF8ToJavaString(env, engine_ip).obj(), |
112 base::android::ConvertUTF8ToJavaString(env, blimp::kEngineVersion).obj()); | 112 base::android::ConvertUTF8ToJavaString(env, |
| 113 version_info::GetVersionNumber()) |
| 114 .obj()); |
113 | 115 |
114 BlimpClientSession::OnAssignmentConnectionAttempted(result, assignment); | 116 BlimpClientSession::OnAssignmentConnectionAttempted(result, assignment); |
115 } | 117 } |
116 | 118 |
117 base::android::ScopedJavaLocalRef<jintArray> | 119 base::android::ScopedJavaLocalRef<jintArray> |
118 BlimpClientSessionAndroid::GetDebugInfo( | 120 BlimpClientSessionAndroid::GetDebugInfo( |
119 JNIEnv* env, | 121 JNIEnv* env, |
120 const base::android::JavaParamRef<jobject>& jobj) { | 122 const base::android::JavaParamRef<jobject>& jobj) { |
121 BlimpConnectionStatistics* stats = | 123 BlimpConnectionStatistics* stats = |
122 BlimpClientSession::GetBlimpConnectionStatistics(); | 124 BlimpClientSession::GetBlimpConnectionStatistics(); |
123 int metrics[] = {stats->Get(BlimpConnectionStatistics::BYTES_RECEIVED), | 125 int metrics[] = {stats->Get(BlimpConnectionStatistics::BYTES_RECEIVED), |
124 stats->Get(BlimpConnectionStatistics::BYTES_SENT), | 126 stats->Get(BlimpConnectionStatistics::BYTES_SENT), |
125 stats->Get(BlimpConnectionStatistics::COMMIT)}; | 127 stats->Get(BlimpConnectionStatistics::COMMIT)}; |
126 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); | 128 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); |
127 } | 129 } |
128 | 130 |
129 } // namespace client | 131 } // namespace client |
130 } // namespace blimp | 132 } // namespace blimp |
OLD | NEW |