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

chrome/browser/sessions/tab_restore_service.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 
 #include <list>
 #include <vector>
 
@@ skipping 150 matching lines @@
 
     // Indicates we finished loading the last tabs (but not necessarily the
     // last session).
     LOADED_LAST_TABS     = 1 << 3,
 
     // Indicates we finished loading the last session (but not necessarily the
     // last tabs).
     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();
 
   // Adds |entry| to the list of entries. If |prune| is true |PruneAndNotify|
   // is invoked. If |to_front| is true the entry is added to the front,
   // otherwise the back. Normal closes go to the front, but tab/window closes
   // from the previous session are added to the back.
   void AddEntry(Entry* entry, bool prune, bool to_front);
 
@@ skipping 44 matching lines @@
   // Returns true if |tab| has more than one navigation. If |tab| has more
   // than one navigation |tab->current_navigation_index| is constrained based
   // on the number of navigations.
   bool ValidateTab(Tab* tab);
 
   // Validates all entries in |entries|, deleting any with no navigations.
   // This also deletes any entries beyond the max number of entries we can
   // 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.
   void OnGotPreviousSession(Handle handle,
                             std::vector<SessionWindow*>* windows);
 
   // Creates and add entries to |entries| for each of the windows in |windows|.
   void CreateEntriesFromWindows(
       std::vector<SessionWindow*>* windows,
       std::vector<Entry*>* entries);
@@ skipping 40 matching lines @@
   // Results from previously closed tabs/sessions is first added here. When
   // the results from both us and the session restore service have finished
   // loading LoadStateChanged is invoked, which adds these entries to
   // entries_.
   std::vector<Entry*> staging_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_