Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: remoting/client/jni/jni_client.cc

Issue 2132883002: [Remoting Android] Placeholder for DesktopView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Making DesktopViewInterface an abstract class of SurfaceView? Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 const base::android::JavaParamRef<jstring>& hostPubkey, 158 const base::android::JavaParamRef<jstring>& hostPubkey,
159 const base::android::JavaParamRef<jstring>& pairId, 159 const base::android::JavaParamRef<jstring>& pairId,
160 const base::android::JavaParamRef<jstring>& pairSecret, 160 const base::android::JavaParamRef<jstring>& pairSecret,
161 const base::android::JavaParamRef<jstring>& capabilities, 161 const base::android::JavaParamRef<jstring>& capabilities,
162 const base::android::JavaParamRef<jstring>& flags) { 162 const base::android::JavaParamRef<jstring>& flags) {
163 #if defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER) 163 #if defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER)
164 #error Feature not implemented. 164 #error Feature not implemented.
165 #else 165 #else
166 JniDisplayHandler* raw_display_handler = new JniDisplayHandler(runtime_); 166 JniDisplayHandler* raw_display_handler = new JniDisplayHandler(runtime_);
167 #endif // defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER) 167 #endif // defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER)
168 Java_Client_setDisplay(env, java_client_.obj(), 168 Java_Client_setDesktopViewFactory(
169 raw_display_handler->GetJavaDisplay().obj()); 169 env, java_client_.obj(),
170 raw_display_handler->CreateDesktopViewFactory().obj());
170 display_handler_.reset(raw_display_handler); 171 display_handler_.reset(raw_display_handler);
171 ConnectToHost(raw_display_handler, 172 ConnectToHost(raw_display_handler,
172 ConvertJavaStringToUTF8(env, username), 173 ConvertJavaStringToUTF8(env, username),
173 ConvertJavaStringToUTF8(env, authToken), 174 ConvertJavaStringToUTF8(env, authToken),
174 ConvertJavaStringToUTF8(env, hostJid), 175 ConvertJavaStringToUTF8(env, hostJid),
175 ConvertJavaStringToUTF8(env, hostId), 176 ConvertJavaStringToUTF8(env, hostId),
176 ConvertJavaStringToUTF8(env, hostPubkey), 177 ConvertJavaStringToUTF8(env, hostPubkey),
177 ConvertJavaStringToUTF8(env, pairId), 178 ConvertJavaStringToUTF8(env, pairId),
178 ConvertJavaStringToUTF8(env, pairSecret), 179 ConvertJavaStringToUTF8(env, pairSecret),
179 ConvertJavaStringToUTF8(env, capabilities), 180 ConvertJavaStringToUTF8(env, capabilities),
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 return weak_factory_.GetWeakPtr(); 297 return weak_factory_.GetWeakPtr();
297 } 298 }
298 299
299 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) { 300 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) {
300 return reinterpret_cast<intptr_t>( 301 return reinterpret_cast<intptr_t>(
301 new JniClient(ChromotingJniRuntime::GetInstance(), 302 new JniClient(ChromotingJniRuntime::GetInstance(),
302 base::android::ScopedJavaGlobalRef<jobject>(env, caller))); 303 base::android::ScopedJavaGlobalRef<jobject>(env, caller)));
303 } 304 }
304 305
305 } // namespace remoting 306 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698