Sessions API - previously Session Restore API. Supports restoring currently open foreign windows an…

chrome/browser/sessions/tab_restore_service_helper.h

Index: chrome/browser/sessions/tab_restore_service_helper.h
diff --git a/chrome/browser/sessions/tab_restore_service_helper.h b/chrome/browser/sessions/tab_restore_service_helper.h
index 3eacc6070796db45230262b83416ff13328a0483..2e8af7f93a95319163511a9fce659166eb2bb0a7 100644
--- a/chrome/browser/sessions/tab_restore_service_helper.h
+++ b/chrome/browser/sessions/tab_restore_service_helper.h
@@ -79,13 +79,18 @@ class TabRestoreServiceHelper {
   void BrowserClosed(TabRestoreServiceDelegate* delegate);
   void ClearEntries();
   const Entries& entries() const;
-  void RestoreMostRecentEntry(TabRestoreServiceDelegate* delegate,
-                              chrome::HostDesktopType host_desktop_type);
+  // In the case of restoring a window, the returned WebContents will contain

[sky, 2013/08/01 00:05:43]

Nuke comments since it's just duplicating what you already have.

[Kristen Dwan, 2013/08/02 20:54:19]

Done.

+  // the last successfully restored tab.
+  content::WebContents* RestoreMostRecentEntry(
+      TabRestoreServiceDelegate* delegate,
+      chrome::HostDesktopType host_desktop_type);
   Tab* RemoveTabEntryById(SessionID::id_type id);
-  void RestoreEntryById(TabRestoreServiceDelegate* delegate,
-                        SessionID::id_type id,
-                        chrome::HostDesktopType host_desktop_type,
-                        WindowOpenDisposition disposition);
+  // In the case of restoring a window, the returned WebContents will contain
+  // the last successfully restored tab.
+  content::WebContents* RestoreEntryById(TabRestoreServiceDelegate* delegate,
+      SessionID::id_type id,
+      chrome::HostDesktopType host_desktop_type,
+      WindowOpenDisposition disposition);
 
   // Notifies observers the tabs have changed.
   void NotifyTabsChanged();
@@ -133,7 +138,8 @@ class TabRestoreServiceHelper {
       const Tab& tab,
       TabRestoreServiceDelegate* delegate,
       chrome::HostDesktopType host_desktop_type,
-      WindowOpenDisposition disposition);
+      WindowOpenDisposition disposition,
+      content::WebContents** contents);
 
   // Returns true if |tab| has more than one navigation. If |tab| has more
   // than one navigation |tab->current_navigation_index| is constrained based