OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "remoting/client/jni/jni_client.h" | 5 #include "remoting/client/jni/jni_client.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "jni/Client_jni.h" | 10 #include "jni/Client_jni.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 const base::android::JavaParamRef<jstring>& hostPubkey, | 159 const base::android::JavaParamRef<jstring>& hostPubkey, |
160 const base::android::JavaParamRef<jstring>& pairId, | 160 const base::android::JavaParamRef<jstring>& pairId, |
161 const base::android::JavaParamRef<jstring>& pairSecret, | 161 const base::android::JavaParamRef<jstring>& pairSecret, |
162 const base::android::JavaParamRef<jstring>& capabilities, | 162 const base::android::JavaParamRef<jstring>& capabilities, |
163 const base::android::JavaParamRef<jstring>& flags) { | 163 const base::android::JavaParamRef<jstring>& flags) { |
164 #if defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER) | 164 #if defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER) |
165 JniGlDisplayHandler* raw_display_handler = new JniGlDisplayHandler(runtime_); | 165 JniGlDisplayHandler* raw_display_handler = new JniGlDisplayHandler(runtime_); |
166 #else | 166 #else |
167 JniDisplayHandler* raw_display_handler = new JniDisplayHandler(runtime_); | 167 JniDisplayHandler* raw_display_handler = new JniDisplayHandler(runtime_); |
168 #endif // defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER) | 168 #endif // defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER) |
169 Java_Client_setDisplay(env, java_client_.obj(), | 169 Java_Client_setDesktopViewFactory( |
170 raw_display_handler->GetJavaDisplay().obj()); | 170 env, java_client_.obj(), |
| 171 raw_display_handler->CreateDesktopViewFactory().obj()); |
171 display_handler_.reset(raw_display_handler); | 172 display_handler_.reset(raw_display_handler); |
172 ConnectToHost(raw_display_handler, | 173 ConnectToHost(raw_display_handler, |
173 ConvertJavaStringToUTF8(env, username), | 174 ConvertJavaStringToUTF8(env, username), |
174 ConvertJavaStringToUTF8(env, authToken), | 175 ConvertJavaStringToUTF8(env, authToken), |
175 ConvertJavaStringToUTF8(env, hostJid), | 176 ConvertJavaStringToUTF8(env, hostJid), |
176 ConvertJavaStringToUTF8(env, hostId), | 177 ConvertJavaStringToUTF8(env, hostId), |
177 ConvertJavaStringToUTF8(env, hostPubkey), | 178 ConvertJavaStringToUTF8(env, hostPubkey), |
178 ConvertJavaStringToUTF8(env, pairId), | 179 ConvertJavaStringToUTF8(env, pairId), |
179 ConvertJavaStringToUTF8(env, pairSecret), | 180 ConvertJavaStringToUTF8(env, pairSecret), |
180 ConvertJavaStringToUTF8(env, capabilities), | 181 ConvertJavaStringToUTF8(env, capabilities), |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 return weak_factory_.GetWeakPtr(); | 298 return weak_factory_.GetWeakPtr(); |
298 } | 299 } |
299 | 300 |
300 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) { | 301 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) { |
301 return reinterpret_cast<intptr_t>( | 302 return reinterpret_cast<intptr_t>( |
302 new JniClient(ChromotingJniRuntime::GetInstance(), | 303 new JniClient(ChromotingJniRuntime::GetInstance(), |
303 base::android::ScopedJavaGlobalRef<jobject>(env, caller))); | 304 base::android::ScopedJavaGlobalRef<jobject>(env, caller))); |
304 } | 305 } |
305 | 306 |
306 } // namespace remoting | 307 } // namespace remoting |
OLD | NEW |