WIP - OpenGL Native Renderer

remoting/client/jni/jni_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/jni/jni_client.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "jni/Client_jni.h"
 #include "remoting/client/jni/chromoting_jni_instance.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
-#include "remoting/client/jni/display_updater_factory.h"
 #include "remoting/client/jni/jni_display_handler.h"
 #include "remoting/client/jni/jni_gl_display_handler.h"
 #include "remoting/client/jni/jni_pairing_secret_fetcher.h"
 #include "remoting/client/jni/jni_touch_event_data.h"
 #include "remoting/client/jni/jni_video_renderer.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 
 namespace remoting {
@@ skipping 132 matching lines @@
     const base::android::JavaParamRef<jobject>& caller,
     const base::android::JavaParamRef<jstring>& username,
     const base::android::JavaParamRef<jstring>& authToken,
     const base::android::JavaParamRef<jstring>& hostJid,
     const base::android::JavaParamRef<jstring>& hostId,
     const base::android::JavaParamRef<jstring>& hostPubkey,
     const base::android::JavaParamRef<jstring>& pairId,
     const base::android::JavaParamRef<jstring>& pairSecret,
     const base::android::JavaParamRef<jstring>& capabilities,
     const base::android::JavaParamRef<jstring>& flags) {
-#if defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER)
-  JniGlDisplayHandler* raw_display_handler = new JniGlDisplayHandler(runtime_);
-#else
-  JniDisplayHandler* raw_display_handler = new JniDisplayHandler(runtime_);
-#endif  // defined(REMOTING_ANDROID_ENABLE_OPENGL_RENDERER)
-  raw_display_handler->InitializeClient(java_client_);
-  display_handler_.reset(raw_display_handler);
-  ConnectToHost(raw_display_handler,
+  if (runtime_->use_opengl_) {
+    JniGlDisplayHandler* raw_display_handler =
+        new JniGlDisplayHandler(runtime_);
+    raw_display_handler->InitializeClient(java_client_);
+    display_handler_.reset(raw_display_handler);
+  } else {
+    JniDisplayHandler* raw_display_handler = new JniDisplayHandler(runtime_);
+    raw_display_handler->InitializeClient(java_client_);
+    display_handler_.reset(raw_display_handler);
+  }
+  ConnectToHost(display_handler_.get(),
                 ConvertJavaStringToUTF8(env, username),
                 ConvertJavaStringToUTF8(env, authToken),
                 ConvertJavaStringToUTF8(env, hostJid),
                 ConvertJavaStringToUTF8(env, hostId),
                 ConvertJavaStringToUTF8(env, hostPubkey),
                 ConvertJavaStringToUTF8(env, pairId),
                 ConvertJavaStringToUTF8(env, pairSecret),
                 ConvertJavaStringToUTF8(env, capabilities),
                 ConvertJavaStringToUTF8(env, flags));
 }
@@ skipping 114 matching lines @@
   return weak_ptr_;
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) {
   return reinterpret_cast<intptr_t>(
       new JniClient(ChromotingJniRuntime::GetInstance(),
                     base::android::ScopedJavaGlobalRef<jobject>(env, caller)));
 }
 
 }  // namespace remoting