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_live_tab.h"
+#include "components/sessions/content/content_serialized_navigation_builder.h"
+#include "components/sessions/core/live_tab.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;
+using sessions::ContentLiveTab;
+using sessions::LiveTab;
 
 namespace {
 
 void AddTabToList(JNIEnv* env,
                   sessions::TabRestoreService::Entry* entry,
                   jobject jtabs_list) {
   const sessions::TabRestoreService::Tab* tab =
       static_cast<sessions::TabRestoreService::Tab*>(entry);
   const sessions::SerializedNavigationEntry& current_navigation =
       tab->navigations.at(tab->current_navigation_index);
@@ skipping 88 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(
+      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;
+  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()) {

[Theresa, 2016/07/06 18:51:05]

I think that rather than finding the correct tab model here, we can just use the
first non-incognito tab model here (quickly tested this in my prototype) because
TabRestoreServiceHelper::RestoreTab calls
TabRestoreService::FindLiveTabContextWithID (which we can use to find the
correct LiveTabContext to restore into based on the browser id).

I only tested this briefly, so there could be problems that I'm not considering.

[xingliu, 2016/07/06 22:35:41]

Smart.. 
Thanks for making this code much cleaner! 

[Theresa, 2016/07/07 19:00:12]

Thanks for reworking it!

+    for (auto it = TabModelList::begin(); it != TabModelList::end(); ++it) {
+      TabModel* model = *it;
+      if (!model->IsOffTheRecord()) {
+        tab_model = model;
+        break;
+      }
+    }
+  }
+
+  if (!tab_model)
+    return false;
+
+  // Restore most recent tab data.
+  std::vector<LiveTab*> restored_tab = tab_restore_service_->
+      RestoreMostRecentEntry(tab_model->GetLiveTabContext());
+  if (restored_tab.empty())
+    return false;
+  ContentLiveTab* content_tab = static_cast<ContentLiveTab*>(restored_tab[0]);
+
+  // Create new tab.
+  tab_model->CreateTab(NULL, content_tab->web_contents(), -1);

[Theresa, 2016/07/06 18:51:06]

This can move to AndroidLiveTabContext::AddRestoredTab()

[xingliu, 2016/07/06 22:35:41]

Done.

+  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);
 }