Restore closed tabs into new windows when necessary, and track the windows th...

chrome/browser/sessions/tab_restore_service.h

Index: chrome/browser/sessions/tab_restore_service.h
===================================================================
--- chrome/browser/sessions/tab_restore_service.h	(revision 14184)
+++ chrome/browser/sessions/tab_restore_service.h	(working copy)
@@ -168,9 +168,11 @@
     LOADED_LAST_SESSION  = 1 << 4
   };
 
-  // Populates tabs->navigations from the NavigationController.
-  void PopulateTabFromController(NavigationController* controller,
-                                 Tab* tab);
+  // Populates the tab's navigations from the NavigationController, and its
+  // browser_id and tabstrip_index from the browser.
+  void PopulateTab(Tab* tab,
+                   Browser* browser,
+                   NavigationController* controller);
 
   // Notifies observers the tabs have changed.
   void NotifyTabsChanged();
@@ -235,6 +237,10 @@
   // hold.
   void ValidateAndDeleteEmptyEntries(std::vector<Entry*>* entries);
 
+  // Finds tab entries with the old browser_id and sets it to the new one.
+  void UpdateTabBrowserIDs(SessionID::id_type old_id,
+                           SessionID::id_type new_id);
+
   // Callback from SessionService when we've received the windows from the
   // previous session. This creates and add entries to |staging_entries_|
   // and invokes LoadStateChanged.