WIP - OpenGL Native Renderer

remoting/client/jni/jni_client.cc

Index: remoting/client/jni/jni_client.cc
diff --git a/remoting/client/jni/jni_client.cc b/remoting/client/jni/jni_client.cc
index b3c7114a71f249b1de53a2ff79cf01b323d69659..326d24ab46a34ee54d525de3c1ba02a07fbc6f9b 100644
--- a/remoting/client/jni/jni_client.cc
+++ b/remoting/client/jni/jni_client.cc
@@ -10,7 +10,6 @@
 #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"
@@ -163,14 +162,17 @@ void JniClient::Connect(
     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),