Foreign session pages now load into current tab.

chrome/browser/android/foreign_session_helper.cc

 // 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.
 
 #include "chrome/browser/android/foreign_session_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_string.h"
+#include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
+#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 216 matching lines @@
             ConvertUTF8ToJavaString(env, session.session_name).Release(),
             session.device_type,
             session.modified_time.ToJavaTime()));
 
     CopyWindowsToJava(env, session, last_pushed_session);
   }
 
   return true;
 }
 
+// TODO (apiccion): Remove this method once the downstream CL lands.
+// See: https://code.google.com/p/chromium/issues/detail?id=257102
+jboolean ForeignSessionHelper::OpenForeignSessionTabOld(JNIEnv* env,
+                                                        jobject obj,

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

don't need this method

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

Done.

+                                                        jstring session_tag,
+                                                        jint tab_id) {
+  SessionModelAssociator* associator = GetSessionModelAssociator(profile_);
+  if (!associator) {
+    LOG(ERROR) << "Null SessionModelAssociator returned.";
+    return false;
+  }
+
+  const SessionTab* tab;
+
+  if (!associator->GetForeignTab(ConvertJavaStringToUTF8(env, session_tag),
+                                 tab_id, &tab)) {
+    LOG(ERROR) << "Failed to load foreign tab.";
+    return false;
+  }
+
+  if (tab->navigations.empty()) {
+    LOG(ERROR) << "Foreign tab no longer has valid navigations.";
+    return false;
+  }
+
+  TabModel* tab_model = TabModelList::GetTabModelWithProfile(profile_);
+  DCHECK(tab_model);
+  if (!tab_model)
+    return false;
+
+  std::vector<content::NavigationEntry*> entries =
+      sessions::SerializedNavigationEntry::ToNavigationEntries(
+          tab->navigations, profile_);
+  content::WebContents* new_web_contents = content::WebContents::Create(
+      content::WebContents::CreateParams(profile_));
+  int selected_index = tab->normalized_navigation_index();
+  new_web_contents->GetController().Restore(
+      selected_index,
+      content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
+      &entries);
+  tab_model->CreateTab(new_web_contents);
+
+  return true;
+}
+
 jboolean ForeignSessionHelper::OpenForeignSessionTab(JNIEnv* env,
                                                      jobject obj,
+                                                     jobject j_tab,
                                                      jstring session_tag,
                                                      jint tab_id) {
   SessionModelAssociator* associator = GetSessionModelAssociator(profile_);
   if (!associator) {
     LOG(ERROR) << "Null SessionModelAssociator returned.";
     return false;
   }
 
   const SessionTab* tab;
 
   if (!associator->GetForeignTab(ConvertJavaStringToUTF8(env, session_tag),
                                  tab_id, &tab)) {
     LOG(ERROR) << "Failed to load foreign tab.";
     return false;
   }
 
   if (tab->navigations.empty()) {

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

you can just replace the rest of this method with a call to
SessionRestore::RestoreForeignSessionTab(), right?

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

Done.

     LOG(ERROR) << "Foreign tab no longer has valid navigations.";
     return false;
   }
 
   TabModel* tab_model = TabModelList::GetTabModelWithProfile(profile_);
   DCHECK(tab_model);
   if (!tab_model)
     return false;
 
   std::vector<content::NavigationEntry*> entries =
       sessions::SerializedNavigationEntry::ToNavigationEntries(
           tab->navigations, profile_);
   content::WebContents* new_web_contents = content::WebContents::Create(
       content::WebContents::CreateParams(profile_));
   int selected_index = tab->normalized_navigation_index();
   new_web_contents->GetController().Restore(
       selected_index,
       content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
       &entries);
-  tab_model->CreateTab(new_web_contents);
+
+  content::WebContents* old_web_contents =
+    tab_model->GetWebContentsAt(tab_model->GetActiveIndex());
+
+  TabAndroid* currentTab = TabAndroid::GetNativeTab(env, j_tab);
+  currentTab->SwapTabContents(old_web_contents, new_web_contents);
 
   return true;
 }
 
 void ForeignSessionHelper::SetForeignSessionCollapsed(JNIEnv* env, jobject obj,
                                                       jstring session_tag,
                                                       jboolean is_collapsed) {
   // Store session tags for collapsed sessions in a preference so that the
   // collapsed state persists.
   PrefService* prefs = profile_->GetPrefs();
@@ skipping 16 matching lines @@
                                                 jstring session_tag) {
   SessionModelAssociator* associator = GetSessionModelAssociator(profile_);
   if (associator)
     associator->DeleteForeignSession(ConvertJavaStringToUTF8(env, session_tag));
 }
 
 // static
 bool ForeignSessionHelper::RegisterForeignSessionHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }