[Remoting Android] Placeholder for DesktopView

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

Index: remoting/android/java/src/org/chromium/chromoting/jni/Client.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/Client.java b/remoting/android/java/src/org/chromium/chromoting/jni/Client.java
index 058fcac32a59ec182ff9210b3a1d1118df470ce2..aaf6d880a94dca48245f50bb1be03a844bd334dc 100644
--- a/remoting/android/java/src/org/chromium/chromoting/jni/Client.java
+++ b/remoting/android/java/src/org/chromium/chromoting/jni/Client.java
@@ -8,6 +8,7 @@ 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;
 
@@ -24,7 +25,7 @@ public class Client implements InputStub {
     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.
@@ -44,7 +45,7 @@ public class Client implements InputStub {
      * @param display the implementation-dependent object used by the desktop view.
      */
     @CalledByNative
-    private void setDisplay(Object display) {
+    private void setDisplay(DesktopViewFactory display) {
         mDisplay = display;
     }
 
@@ -53,7 +54,7 @@ public class Client implements InputStub {
      * disconnectFromHost().
      * @return the display object.
      */
-    public Object getDisplay() {
+    public DesktopViewFactory getDisplay() {
         return mDisplay;
     }