Shortcut ctrl+shift+T added on android.

chrome/browser/android/recently_closed_tabs_bridge.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/recently_closed_tabs_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/tab_restore_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 "components/sessions/content/content_serialized_navigation_builder.h"
 #include "components/sessions/core/tab_restore_service.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/RecentlyClosedBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
@@ skipping 95 matching lines @@
   session_tab.navigations = tab_entry->navigations;
 
   WindowOpenDisposition disposition =
       static_cast<WindowOpenDisposition>(j_disposition);
   SessionRestore::RestoreForeignSessionTab(web_contents,
                                            session_tab,
                                            disposition);
   return true;
 }
 
+jboolean RecentlyClosedTabsBridge::OpenMostRecentlyClosedTab(

[Theresa, 2016/07/02 01:00:36]

I did some testing, and we can change this to use the TabRestoreService, which
is ideal because then we're diverging from the other platforms less.

Instead of most of the logic below, we could just call
tab_restore_service_->RestoreMostRecentEntry(tab_model->GetLiveTabContext());

+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj) {
+  EnsureTabRestoreService();
+  if (!tab_restore_service_ || TabModelList::empty())
+    return false;
+
+  const sessions::TabRestoreService::Entries& entries =
+      tab_restore_service_->entries();
+  if (entries.empty())
+    return false;
+
+  // Find the correct non-incognito tab model based on TabAndroid.window_id.
+  using RestoreTab = const sessions::TabRestoreService::Tab;
+  RestoreTab* restore_tab = static_cast<RestoreTab*>(entries.front());
+  SessionID::id_type window_id = restore_tab->browser_id;

[Theresa, 2016/07/02 01:00:37]

In my prototyping, I hadn't come up with a different way to figure out the
window id in order to get the TabModel/LiveTabContext, but it'd be nice if there
were a more elegant way to do this. I'll think on it.

+  TabModel* tab_model = TabModelList::FindTabModelWithId(window_id);
+  // If no tab model matched the window id, fall back to first non-incognito
+  // model.
+  if (!tab_model || tab_model->IsOffTheRecord()) {
+    for (auto it = TabModelList::begin(); it != TabModelList::end(); ++it) {
+      TabModel* model = *it;
+      if (!model->IsOffTheRecord()) {
+        tab_model = model;
+        break;
+      }
+    }
+  }
+
+  if (!tab_model)
+    return false;
+
+  // Remove most recent tab restore entry.
+  std::unique_ptr<sessions::TabRestoreService::Tab> tab_entry(
+        tab_restore_service_->RemoveTabEntryById(restore_tab->id));
+  if (!tab_entry)
+    return false;
+
+  // Restore navigation history.
+  sessions::SessionTab session_tab;
+  session_tab.current_navigation_index = tab_entry->current_navigation_index;
+  session_tab.navigations = tab_entry->navigations;
+  std::vector<std::unique_ptr<content::NavigationEntry>> nav_entries =
+        sessions::ContentSerializedNavigationBuilder::ToNavigationEntries(
+            session_tab.navigations, profile_);
+
+  // Prepare web content.
+  content::WebContents* web_contents = content::WebContents::Create(
+          content::WebContents::CreateParams(profile_));
+  web_contents->GetController().Restore(
+      session_tab.normalized_navigation_index(),
+      content::NavigationController::RESTORE_CURRENT_SESSION,
+      &nav_entries);
+
+  // Create new tab.
+  tab_model->CreateTab(NULL, web_contents, -1);
+  return true;
+}
+
 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   EnsureTabRestoreService();
   if (tab_restore_service_)
     tab_restore_service_->ClearEntries();
 }
 
 void RecentlyClosedTabsBridge::TabRestoreServiceChanged(
     sessions::TabRestoreService* service) {
@@ skipping 29 matching lines @@
                   const JavaParamRef<jobject>& jprofile) {
   RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge(
       ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(bridge);
 }
 
 // static
 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }