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;
 }
 
+// Open most recently closed tab, don't need parent tab.

[Theresa, 2016/06/30 20:50:25]

nit: I don't think this comment is necessary.

[xingliu, 2016/07/01 00:30:38]

Done.

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

[Theresa, 2016/06/30 20:50:25]

reminder to move this up to the top of the file.

[xingliu, 2016/07/01 00:30:38]

This is different from using Someclass, I remember some other code do aliasing
in functions, do we have coding convention on this?

+  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, fall back to first non-incognito model.

[Theresa, 2016/06/30 20:50:25]

nit: "If no tab model matches the window_id, fallback to the first non-incognito
model."

[xingliu, 2016/07/01 00:30:38]

Done.

+  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 last tab restore record.

[Theresa, 2016/06/30 20:50:25]

nit: capitalize Remove (same for other code comments in this file)

Maybe this should be "Remove most recent tab restore record."? It's a little bit
confusing to read "last" then see entries.front() below.

[xingliu, 2016/07/01 00:30:38]

Done.

+  std::unique_ptr<sessions::TabRestoreService::Tab> tab_entry(
+        tab_restore_service_->RemoveTabEntryById(entries.front()->id));

[Theresa, 2016/06/30 20:50:25]

use restore_tab->id here instead of entries.front()->id?

[xingliu, 2016/07/01 00:30:38]

Done.

+  if (!tab_entry)
+    return false;
+
+  // restore navigation history and prepare web content.
+  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_);
+  content::WebContents* web_contents = content::WebContents::Create(

[Theresa, 2016/06/30 20:50:25]

nit: make this a new block? e.g.

// Restore navigation history.
session::SessionTab session_tab;
...

// Prepare WebContents.
content::WebContents* web_contents...

[xingliu, 2016/07/01 00:30:38]

Done.

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