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

chrome/browser/sessions/tab_restore_service.cc

 // 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.
 
 #include <algorithm>
 #include <iterator>
 
 #include "chrome/browser/sessions/tab_restore_service.h"
 
 #include "chrome/browser/browser_list.h"
@@ skipping 108 matching lines @@
 
 void TabRestoreService::CreateHistoricalTab(NavigationController* tab) {
   if (restoring_)
     return;
 
   Browser* browser = Browser::GetBrowserForController(tab, NULL);
   if (closing_browsers_.find(browser) != closing_browsers_.end())
     return;
 
   scoped_ptr<Tab> local_tab(new Tab());
-  PopulateTabFromController(tab, local_tab.get());
+  PopulateTab(local_tab.get(), browser, tab);
   if (local_tab->navigations.empty())
     return;
 
-  // browser may be NULL when running unit tests.
-  if (browser) {
-    local_tab->browser_id = browser->session_id().id();
-    local_tab->tabstrip_index =
-        browser->tabstrip_model()->GetIndexOfController(tab);
-  }
-
   AddEntry(local_tab.release(), true, true);
 }
 
 void TabRestoreService::BrowserClosing(Browser* browser) {
   if (browser->type() != Browser::TYPE_NORMAL ||
       browser->tab_count() == 0)
     return;
 
   closing_browsers_.insert(browser);
 
   Window* window = new Window();
   window->selected_tab_index = browser->selected_index();
   window->tabs.resize(browser->tab_count());
   size_t entry_index = 0;
   for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
-    PopulateTabFromController(
-        &browser->GetTabContentsAt(tab_index)->controller(),
-        &(window->tabs[entry_index]));
-    if (window->tabs[entry_index].navigations.empty())
+    PopulateTab(&(window->tabs[entry_index]),
+                browser,
+                &browser->GetTabContentsAt(tab_index)->controller());
+    if (window->tabs[entry_index].navigations.empty()) {
       window->tabs.erase(window->tabs.begin() + entry_index);
-    else
+    } else {
+      window->tabs[entry_index].browser_id = browser->session_id().id();
       entry_index++;
+    }
   }
   if (window->tabs.empty()) {
     delete window;
     window = NULL;
   } else {
     window->selected_tab_index =
         std::min(static_cast<int>(window->tabs.size() - 1),
                  window->selected_tab_index);
     AddEntry(window, true, true);
   }
@@ skipping 54 matching lines @@
       Tab* tab = static_cast<Tab*>(entry);
       if (replace_existing_tab) {
         browser->ReplaceRestoredTab(tab->navigations,
                                     tab->current_navigation_index);
       } else {
         // Use the tab's former browser and index, if available.
         Browser* tab_browser = NULL;
         int tab_index = -1;
         if (tab->has_browser())
           tab_browser = BrowserList::FindBrowserWithID(tab->browser_id);
-        if (tab_browser)
+
+        if (tab_browser) {
           tab_index = tab->tabstrip_index;
-        else
-          tab_browser = browser;
-        if (tab_index < 0 || tab_index > browser->tab_count())
-          tab_index = browser->tab_count();
+        } else {
+          tab_browser = Browser::Create(profile());
+          if (tab->has_browser()) {
+            UpdateTabBrowserIDs(tab->browser_id,
+                                tab_browser->session_id().id());
+          }
+          tab_browser->window()->Show();
+        }
+
+        if (tab_index < 0 || tab_index > tab_browser->tab_count())
+          tab_index = tab_browser->tab_count();
         tab_browser->AddRestoredTab(tab->navigations, tab_index,
                                     tab->current_navigation_index, true);
       }
     } else if (entry->type == WINDOW) {
       const Window* window = static_cast<Window*>(entry);
       Browser* browser = Browser::Create(profile());
       for (size_t tab_i = 0; tab_i < window->tabs.size(); ++tab_i) {
         const Tab& tab = window->tabs[tab_i];
         TabContents* restored_tab =
             browser->AddRestoredTab(tab.navigations, browser->tab_count(),
                                     tab.current_navigation_index,
                                     (static_cast<int>(tab_i) ==
                                      window->selected_tab_index));
         if (restored_tab)
           restored_tab->controller().LoadIfNecessary();
       }
+      // All the window's tabs had the same former browser_id.
+      if (window->tabs[0].has_browser()) {
+        UpdateTabBrowserIDs(window->tabs[0].browser_id,
+                            browser->session_id().id());
+      }
       browser->window()->Show();
     } else {
       NOTREACHED();
     }
   }
   delete entry;
   restoring_ = false;
   NotifyTabsChanged();
 }
 
@@ skipping 50 matching lines @@
         ScheduleCommandsForWindow(*static_cast<Window*>(entry));
       }
       entries_written_++;
     }
   }
   if (pending_reset())
     entries_written_ = 0;
   BaseSessionService::Save();
 }
 
-void TabRestoreService::PopulateTabFromController(
-    NavigationController* controller,
-    Tab* tab) {
+void TabRestoreService::PopulateTab(Tab* tab,
+                                    Browser* browser,
+                                    NavigationController* controller) {
   const int pending_index = controller->pending_entry_index();
   int entry_count = controller->entry_count();
   if (entry_count == 0 && pending_index == 0)
     entry_count++;
   tab->navigations.resize(static_cast<int>(entry_count));
   for (int i = 0; i < entry_count; ++i) {
     NavigationEntry* entry = (i == pending_index) ?
         controller->pending_entry() : controller->GetEntryAtIndex(i);
     tab->navigations[i].SetFromNavigationEntry(*entry);
   }
   tab->current_navigation_index = controller->GetCurrentEntryIndex();
   if (tab->current_navigation_index == -1 && entry_count > 0)
     tab->current_navigation_index = 0;
+
+  // Browser may be NULL during unit tests.
+  if (browser) {
+    tab->browser_id = browser->session_id().id();
+    tab->tabstrip_index =
+        browser->tabstrip_model()->GetIndexOfController(controller);
+  }
 }
 
 void TabRestoreService::NotifyTabsChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, TabRestoreServiceChanged(this));
 }
 
 void TabRestoreService::AddEntry(Entry* entry, bool notify, bool to_front) {
   if (to_front)
     entries_.push_front(entry);
   else
@@ skipping 322 matching lines @@
     else
       invalid_entries.push_back(*i);
   }
   // NOTE: at this point the entries are ordered with newest at the front.
   entries->swap(valid_entries);
 
   // Delete the remaining entries.
   STLDeleteElements(&invalid_entries);
 }
 
+void TabRestoreService::UpdateTabBrowserIDs(SessionID::id_type old_id,
+                                            SessionID::id_type new_id) {
+  for (Entries::iterator i = entries_.begin(); i != entries_.end(); ++i) {
+    Entry* entry = *i;
+    if (entry->type == TAB) {
+      Tab* tab = static_cast<Tab*>(entry);
+      if (tab->browser_id == old_id)
+        tab->browser_id = new_id;
+    }
+  }
+}
+
 void TabRestoreService::OnGotPreviousSession(
     Handle handle,
     std::vector<SessionWindow*>* windows) {
   std::vector<Entry*> entries;
   CreateEntriesFromWindows(windows, &entries);
   // Previous session tabs go first.
   staging_entries_.insert(staging_entries_.begin(), entries.begin(),
                           entries.end());
   load_state_ |= LOADED_LAST_SESSION;
   LoadStateChanged();
@@ skipping 66 matching lines @@
   // it doesn't delete them.
   staging_entries_.clear();
 
   // Make it so we rewrite all the tabs. We need to do this otherwise we won't
   // correctly write out the entries when Save is invoked (Save starts from
   // the front, not the end and we just added the entries to the end).
   entries_to_write_ = staging_entries_.size();
 
   PruneAndNotify();
 }