[Remoting Android] Placeholder for DesktopView

remoting/android/java/src/org/chromium/chromoting/jni/Client.java

 // Copyright 2015 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.
 
 package org.chromium.chromoting.jni;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.chromoting.CapabilityManager;
+import org.chromium.chromoting.DesktopViewFactory;
 import org.chromium.chromoting.InputStub;
 import org.chromium.chromoting.SessionAuthenticator;
 
 /**
  * Class to manage a client connection to the host. This class controls the lifetime of the
  * corresponding C++ object which implements the connection. A new object should be created for
  * each connection to the host, so that notifications from a connection are always sent to the
  * right object.
  * This class is used entirely on the UI thread.
  */
 @JNINamespace("remoting")
 public class Client implements InputStub {
     // Pointer to the C++ object, cast to a |long|.
     private long mNativeJniClient;
 
     // Implementation-dependent display object used by the desktop view.
-    private Object mDisplay;
+    private DesktopViewFactory mDisplay;

[Lambros, 2016/07/08 02:13:41]

Can you fix the naming inconsistency somehow?
Either mDisplayFactory / DisplayFactory
Or mDesktopViewFactory / DesktopViewFactory.
Or maybe DisplayViewFactory?

[Yuwei, 2016/07/08 19:58:56]

Logically speaking, this interface is just for creating a DesktopView, so it
should be called as DesktopViewFactory. But it also represents the
implementation specific display handler.

Just separated the DesktopViewFactory from the idea of display object and made
the display object a private detail of the desktop view.

This breaks the cardboard code since now Display is tightly bundled with the
DesktopView and the cardboard renderer can no longer get the reference to
Display from Client.

Seems like we don't care too much about the cardboard feature. I just pass in
null for the Display to fix the build and will file a bug for this as a reminder
of this issue.

 
     // The global Client instance (may be null). This needs to be a global singleton so that the
     // Client can be passed between Activities.
     private static Client sClient;
 
     public Client() {
         if (sClient != null) {
             throw new RuntimeException("Client instance already created.");
         }
 
         sClient = this;
         mNativeJniClient = nativeInit();
     }
 
     /**
      * Sets the display object. Called by the native code when the connection starts.
      * @param display the implementation-dependent object used by the desktop view.
      */
     @CalledByNative
-    private void setDisplay(Object display) {
+    private void setDisplay(DesktopViewFactory display) {
         mDisplay = display;
     }
 
     /**
      * Returns the display object. It will be null before calling connectToHost() or after calling
      * disconnectFromHost().
      * @return the display object.
      */
-    public Object getDisplay() {
+    public DesktopViewFactory getDisplay() {
         return mDisplay;
     }
 
     // Suppress FindBugs warning, since |sClient| is only used on the UI thread.
     @SuppressFBWarnings("LI_LAZY_INIT_STATIC")
     public void destroy() {
         if (sClient != null) {
             disconnectFromHost();
             nativeDestroy(mNativeJniClient);
             sClient = null;
@@ skipping 268 matching lines @@
     /** Passes touch event information to the native handling code. */
     private native void nativeSendTouchEvent(
             long nativeJniClient, int eventType, TouchEventData[] data);
 
     /** Native implementation of Client.enableVideoChannel() */
     private native void nativeEnableVideoChannel(long nativeJniClient, boolean enable);
 
     /** Passes extension message to the native code. */
     private native void nativeSendExtensionMessage(long nativeJniClient, String type, String data);
 }