Changes tab restore service to handle restoring closed windows as a...

chrome/browser/browser.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 <windows.h>
 #include <shellapi.h>
 
 #include "chrome/browser/browser.h"
 
 #include "base/command_line.h"
@@ skipping 171 matching lines @@
     // chrome won't shutdown cleanly, and may end up crashing when some
     // thread tries to use the IO thread (or another thread) that is no longer
     // valid.
     profile_->ResetTabRestoreService();
   }
 
   SessionService* session_service = profile_->GetSessionService();
   if (session_service)
     session_service->WindowClosed(session_id_);
 
+  TabRestoreService* tab_restore_service = profile()->GetTabRestoreService();
+  if (tab_restore_service)
+    tab_restore_service->BrowserClosed(this);
+
   NotificationService::current()->RemoveObserver(
       this, NOTIFY_SSL_STATE_CHANGED, NotificationService::AllSources());
 
   if (profile_->IsOffTheRecord() &&
       !BrowserList::IsOffTheRecordSessionActive()) {
     // We reuse the OTR cookie store across OTR windows.  If the last OTR
     // window is closed, then we want to wipe the cookie store clean, so when
     // an OTR window is open again, it starts with an empty cookie store.  This
     // also frees up the memory that the OTR cookies were using.  OTR never
     // loads or writes persistent cookies (there is no backing store), so we
@@ skipping 230 matching lines @@
 
   if (BrowserList::size() == 1)
     browser_shutdown::OnShutdownStarting(browser_shutdown::WINDOW_CLOSE);
 
   // Don't use HasSessionService here, we want to force creation of the
   // session service so that user can restore what was open.
   SessionService* session_service = profile()->GetSessionService();
   if (session_service)
     session_service->WindowClosing(session_id());
 
+  TabRestoreService* tab_restore_service = profile()->GetTabRestoreService();
+  if (tab_restore_service)
+    tab_restore_service->BrowserClosing(this);
+
   CloseAllTabs();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Tab adding/showing functions:
 
 TabContents* Browser::AddTabWithURL(
     const GURL& url, const GURL& referrer, PageTransition::Type transition,
     bool foreground, SiteInstance* instance) {
   if (type_ == TYPE_APP && tabstrip_model_.count() == 1) {
@@ skipping 230 matching lines @@
   UserMetrics::RecordAction(L"Duplicate", profile_);
   DuplicateContentsAt(selected_index());
 }
 
 void Browser::RestoreTab() {
   UserMetrics::RecordAction(L"RestoreTab", profile_);
   TabRestoreService* service = profile_->GetTabRestoreService();
   if (!service)
     return;
 
-  const TabRestoreService::Tabs& tabs = service->tabs();
-  if (tabs.empty() || tabs.front().from_last_session)
-    return;
-
-  const TabRestoreService::HistoricalTab& tab = tabs.front();
-  AddRestoredTab(tab.navigations, tab_count(), tab.current_navigation_index,
-                 true);
-  service->RemoveHistoricalTabById(tab.id);
+  service->RestoreMostRecentEntry(this);
 }
 
 void Browser::ConvertPopupToTabbedBrowser() {
   UserMetrics::RecordAction(L"ShowAsTab", profile_);
 
   if (type() != TYPE_NORMAL) {
     NOTREACHED();
     return;
   }
 
@@ skipping 1235 matching lines @@
   controller_.UpdateCommandEnabled(IDC_EXIT, true);
   // the debugger doesn't work in single process mode
   controller_.UpdateCommandEnabled(IDC_DEBUGGER,
       !RenderProcessHost::run_renderer_in_process());
   controller_.UpdateCommandEnabled(IDC_DEVELOPER, true);
   controller_.UpdateCommandEnabled(IDC_HELPMENU, true);
 }
 
 void Browser::UpdateNavigationCommands() {
   TabContents* current_tab = GetSelectedTabContents();
+  if (!current_tab) {
+    // It's possible for this to be null during tab restore.
+    return;
+  }
+
   NavigationController* nc = current_tab->controller();
   controller_.UpdateCommandEnabled(IDC_BACK, nc->CanGoBack());
   controller_.UpdateCommandEnabled(IDC_FORWARD, nc->CanGoForward());
 
   WebContents* web_contents = current_tab->AsWebContents();
 
   if (web_contents) {
     controller_.UpdateCommandEnabled(IDC_STAR, true);
     SetStarredButtonToggled(web_contents->is_starred());
 
@@ skipping 380 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }