Foreign session pages now load into current tab.

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

 // Copyright 2013 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.chrome.browser;
 
 import org.chromium.base.CalledByNative;
+import org.chromium.chrome.browser.TabBase;
 import org.chromium.chrome.browser.profiles.Profile;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 /**
  * This class exposes to Java information about sessions, windows, and tabs on the user's synced
  * devices.
@@ skipping 152 matching lines @@
                 }
             });
         } else {
             result = null;
         }
 
         return result;
     }
 
     /**
+     * TODO (apiccion): Remvoe this method once downstream CL Lands.
+     * See: https://code.google.com/p/chromium/issues/detail?id=257102
      * Opens the given foreign tab in a new tab.
      * @param session Session that the target tab belongs to.
      * @param tab     Target tab to open.
      * @return        {@code True} iff the tab is successfully opened.
      */
     public boolean openForeignSessionTab(ForeignSession session, ForeignSessionTab tab) {
-        return nativeOpenForeignSessionTab(mNativeForeignSessionHelper, session.tag, tab.id);
+        return nativeOpenForeignSessionTabOld(mNativeForeignSessionHelper, session.tag, tab.id);
     }
 
     /**
+     * Opens the given foreign tab in a new tab.
+     * @param tab Tab to load the session into.
+     * @param session Session that the target tab belongs to.
+     * @param foreignTab Target tab to open.
+     * @return        {@code True} iff the tab is successfully opened.
+     */
+    public boolean openForeignSessionTab(TabBase tab, ForeignSession session,
+            ForeignSessionTab foreignTab) {

[newt (away), 2013/11/01 23:41:32]

could you add windowDisposition here as another argument? we'll use that to
determine whether the tab should be opened in the current tab or a new tab. See:
WindowOpenDisposition.java (it's autogenerated... in the out directory). Or you
could just use a boolean openInCurrentTab.

Then, you can delete the ForeignSessionHelper::OpenForeignSessionTabOld() and
handle both cases in ForeignSessionHelper::OpenForeignSessionTab() by passing in
the disposition/boolean to that method.

[apiccion, 2013/11/02 01:01:14]

Added windowDisposition. Cannot remove *Old() call due to dependency on
web_contents.

On 2013/11/01 23:41:32, newt wrote:

+        return nativeOpenForeignSessionTab(mNativeForeignSessionHelper, tab, session.tag,
+            foreignTab.id);
+    }
+
+    /**
      * Set the given session collapsed or uncollapsed in preferences.
      * @param session     Session to set collapsed or uncollapsed.
      * @param isCollapsed {@code True} iff we want the session to be collapsed.
      */
     public void setForeignSessionCollapsed(ForeignSession session, boolean isCollapsed) {
         nativeSetForeignSessionCollapsed(mNativeForeignSessionHelper, session.tag, isCollapsed);
     }
 
     /**
      * Get the given session collapsed or uncollapsed state in preferences.
@@ skipping 15 matching lines @@
         nativeDeleteForeignSession(mNativeForeignSessionHelper, session.tag);
     }
 
     private static native int nativeInit(Profile profile);
     private static native void nativeDestroy(int nativeForeignSessionHelper);
     private static native boolean nativeIsTabSyncEnabled(int nativeForeignSessionHelper);
     private static native void nativeSetOnForeignSessionCallback(
             int nativeForeignSessionHelper, ForeignSessionCallback callback);
     private static native boolean nativeGetForeignSessions(int nativeForeignSessionHelper,
             List<ForeignSession> resultSessions);
+    // TODO (apiccion): Remvoe this method once downstream CL Lands.
+    // See: https://code.google.com/p/chromium/issues/detail?id=257102
+    private static native boolean nativeOpenForeignSessionTabOld(
+            int nativeForeignSessionHelper, String sessionTag, int tabId);
     private static native boolean nativeOpenForeignSessionTab(
-            int nativeForeignSessionHelper, String sessionTag, int tabId);
+            int nativeForeignSessionHelper, TabBase tab, 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);
 }