ForeignSessionHelper Changes Needed for NTP Other Devices.

chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java
index 4faf66b2eb9bdce6335506cdba843c01e8069a4c..ce4cb642e0bd6a57f4a0bfbd0a756c2e49706c2c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java
@@ -37,13 +37,23 @@ public class ForeignSessionHelper {
      * Represents synced foreign session.
      */
     public static class ForeignSession {
+        // Please keep in sync with sync_session.h

[Yaron, 2013/09/20 22:18:08]

We have a way of ensuring this. See usage of build/android/java_cpp_template. If
you don't do that, you at least need to add the comment there as it's more
likely to change.

Do you need this enum though? Could you instead return up a resource that's
computed the same way it already was for native? I'm not sure how this is used..

[apiccion, 2013/09/20 23:02:57]

Using this to determine what icon to display (laptop or phone) for next to the
foreign session device name on the other devices page. The template says it
works for (preprocessor (e.g. #define)) but the constants I want are enums. I
added the comment to synced_session.h

[Yaron, 2013/09/20 23:07:13]

Right, so we already have those assets in chromium for the open tabs webui page.
Could you return the resource instead of having to map the ids? At a minimum, we
should reuse the resources if possible unless there are scaling issues with
using the existing resources on android

+        public static final int DEVICE_TYPE_UNSET = 0;
+        public static final int DEVICE_TYPE_WIN = 1;
+        public static final int DEVICE_TYPE_MACOSX = 2;
+        public static final int DEVICE_TYPE_LINUX = 3;
+        public static final int DEVICE_TYPE_CHROMEOS = 4;
+        public static final int DEVICE_TYPE_OTHER = 5;
+        public static final int DEVICE_TYPE_PHONE = 6;
+        public static final int DEVICE_TYPE_TABLET = 7;
+
         public final String tag;
         public final String name;
-        public final String deviceType;
+        public final int deviceType;
         public final long modifiedTime;
         public final List<ForeignSessionWindow> windows = new ArrayList<ForeignSessionWindow>();
 
-        private ForeignSession(String tag, String name, String deviceType, long modifiedTime) {
+        private ForeignSession(String tag, String name, int deviceType, long modifiedTime) {
             this.tag = tag;
             this.name = name;
             this.deviceType = deviceType;
@@ -85,7 +95,7 @@ public class ForeignSessionHelper {
 
     @CalledByNative
     private static ForeignSession pushSession(
-            List<ForeignSession> sessions, String tag, String name, String deviceType,
+            List<ForeignSession> sessions, String tag, String name, int deviceType,
             long modifiedTime) {
         ForeignSession session = new ForeignSession(tag, name, deviceType, modifiedTime);
         sessions.add(session);
@@ -186,6 +196,15 @@ public class ForeignSessionHelper {
     }
 
     /**
+     * Get the given session collapsed or uncollapsed state in preferences.
+     * @param   session Session to fetch collapsed state.
+     * @return          {@code True} if the session is collapsed, false if expanded.

[newt (away), 2013/09/20 21:14:35]

nit: spacing

[apiccion, 2013/09/20 22:15:21]

Done.

+     */
+    public boolean getForeignSessionCollapsed(ForeignSession session) {
+        return nativeGetForeignSessionCollapsed(mNativeForeignSessionHelper, session.tag);
+    }
+
+    /**
      * Remove Foreign session to display. Note that it will be reappear on the next sync.
      *
      * This is mainly for when user wants to delete very old session that won't be used or syned in
@@ -207,6 +226,8 @@ public class ForeignSessionHelper {
             int nativeForeignSessionHelper, String sessionTag, int tabId);
     private static native void nativeSetForeignSessionCollapsed(
             int nativeForeignSessionHelper, String sessionTag, boolean isCollapsed);
+    private static native boolean nativeGetForeignSessionCollapsed(
+            int nativeForeignSessionHelper, String sessionTag);
     private static native void nativeDeleteForeignSession(
             int nativeForeignSessionHelper, String sessionTag);
 }