Shortcut ctrl+shift+T added on android.

chrome/browser/ui/android/tab_model/android_live_tab_context.cc

Index: chrome/browser/ui/android/tab_model/android_live_tab_context.cc
diff --git a/chrome/browser/ui/android/tab_model/android_live_tab_context.cc b/chrome/browser/ui/android/tab_model/android_live_tab_context.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5aa69b363e09324274c2f42287188532c71c2662
--- /dev/null
+++ b/chrome/browser/ui/android/tab_model/android_live_tab_context.cc
@@ -0,0 +1,98 @@
+// Copyright 2016 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/tab_android.h"
+#include "chrome/browser/ui/android/tab_model/android_live_tab_context.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"
+
+AndroidLiveTabContext::AndroidLiveTabContext(TabModel* tab_model)
+    : tab_model_(tab_model) {}
+
+// Not supported by android.
+void AndroidLiveTabContext::ShowBrowserWindow() {
+}
+
+const SessionID& AndroidLiveTabContext::GetSessionID() const {
+  return tab_model_->SessionId();
+}
+
+int AndroidLiveTabContext::GetTabCount() const {
+  return tab_model_->GetTabCount();
+}
+
+int AndroidLiveTabContext::GetSelectedIndex() const {
+  return tab_model_->GetActiveIndex();
+}
+
+// Not supported by android.
+std::string AndroidLiveTabContext::GetAppName() const {
+  return std::string();
+}
+
+sessions::LiveTab* AndroidLiveTabContext::GetLiveTabAt(int index) const {
+  TabAndroid* tab_android = tab_model_->GetTabAt(index);
+  if (!tab_android || !tab_android->web_contents())
+    return nullptr;
+
+  return sessions::ContentLiveTab::GetForWebContents(
+      tab_android->web_contents());
+}
+
+sessions::LiveTab* AndroidLiveTabContext::GetActiveLiveTab() const {
+  content::WebContents* web_contents = tab_model_->GetActiveWebContents();
+  if (!web_contents)
+    return nullptr;
+
+  return sessions::ContentLiveTab::GetForWebContents(web_contents);
+}
+
+// Not supported by android.
+bool AndroidLiveTabContext::IsTabPinned(int index) const {
+  return false;
+}
+
+// Currently do nothing.
+sessions::LiveTab* AndroidLiveTabContext::AddRestoredTab(
+    const std::vector<sessions::SerializedNavigationEntry>& navigations,
+    int tab_index,
+    int selected_navigation,
+    const std::string& extension_app_id,
+    bool select,
+    bool pin,
+    bool from_last_session,
+    const sessions::PlatformSpecificTabData* tab_platform_data,
+    const std::string& user_agent_override) {
+  NOTIMPLEMENTED();
+  return nullptr;

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

This would also need to be implemented. It would basically be the second half of
the method in recently_closed_tabs_bridge.cc. We can use tab_model_ to get the
profile and sessions::ContentLiveTab::GetForWebContents() to create the LiveTab
at the end.

+}
+
+// Currently do nothing.
+sessions::LiveTab* AndroidLiveTabContext::ReplaceRestoredTab(
+    const std::vector<sessions::SerializedNavigationEntry>& navigations,
+    int selected_navigation,
+    bool from_last_session,
+    const std::string& extension_app_id,
+    const sessions::PlatformSpecificTabData* tab_platform_data,
+    const std::string& user_agent_override) {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+// Currently do nothing.
+void AndroidLiveTabContext::CloseTab() {
+  NOTIMPLEMENTED();
+}
+
+// static.
+sessions::LiveTabContext* AndroidLiveTabContext::FindContextForWebContents(
+    const content::WebContents* contents) {
+  TabAndroid* tab_android = TabAndroid::FromWebContents(contents);
+  TabModel* model = TabModelList::FindTabModelWithId(
+      tab_android->window_id().id());
+
+  return model ? model->GetLiveTabContext() : nullptr;
+}
+

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

We would need a new method here,
sessions::LiveTabContext*
AndroidLiveTabContext::FindContextWithID(SessionID::id_type desired_id).

A simple implementation would be TabModelList::FindModelWithId(). It'd be nice
if we could find a way to move the fallback logic currently in
recently_closed_tabs_bridge.cc to return the first non-incognito model if a
model matching the id isn't found to this method.

[xingliu, 2016/07/05 19:46:38]

Updated the CL, refactor the code to use RestoreMostRecentEntry, also improve
test case quality for multi-window scenario(from earlier comment in patch 16).
Didn't find a more elegant way to pick the correct window id, too.