Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/sessions/tab_restore_service_helper.h

 // Copyright 2012 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_HELPER_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "components/sessions/session_id.h"
 #include "components/sessions/session_types.h"
 
 class TabRestoreService;
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 class TimeFactory;
 
-namespace content {
-class NavigationController;
-class WebContents;
-}
-
 namespace sessions {
 class TabRestoreServiceClient;
 }
 
 // Helper class used to implement InMemoryTabRestoreService and
 // PersistentTabRestoreService. See tab_restore_service.h for method-level
 // comments.
 class TabRestoreServiceHelper {
  public:
   typedef TabRestoreService::Entries Entries;
@@ skipping 32 matching lines @@
   TabRestoreServiceHelper(TabRestoreService* tab_restore_service,
                           Observer* observer,
                           sessions::TabRestoreServiceClient* client,
                           TimeFactory* time_factory);
 
   ~TabRestoreServiceHelper();
 
   // Helper methods used to implement TabRestoreService.
   void AddObserver(TabRestoreServiceObserver* observer);
   void RemoveObserver(TabRestoreServiceObserver* observer);
-  void CreateHistoricalTab(content::WebContents* contents, int index);
+  void CreateHistoricalTab(sessions::LiveTab* live_tab, int index);
   void BrowserClosing(TabRestoreServiceDelegate* delegate);
   void BrowserClosed(TabRestoreServiceDelegate* delegate);
   void ClearEntries();
   const Entries& entries() const;
-  std::vector<content::WebContents*> RestoreMostRecentEntry(
+  std::vector<sessions::LiveTab*> RestoreMostRecentEntry(
       TabRestoreServiceDelegate* delegate,
       int host_desktop_type);
   Tab* RemoveTabEntryById(SessionID::id_type id);
-  std::vector<content::WebContents*> RestoreEntryById(
+  std::vector<sessions::LiveTab*> RestoreEntryById(
       TabRestoreServiceDelegate* delegate,
       SessionID::id_type id,
       int host_desktop_type,
       WindowOpenDisposition disposition);
 
   // Notifies observers the tabs have changed.
   void NotifyTabsChanged();
 
   // Notifies observers the service has loaded.
   void NotifyLoaded();
@@ skipping 13 matching lines @@
   // identifies a tab, then the iterator position of the Window in which the Tab
   // resides is returned.
   Entries::iterator GetEntryIteratorById(SessionID::id_type id);
 
   // Calls either ValidateTab or ValidateWindow as appropriate.
   static bool ValidateEntry(Entry* entry);
 
  private:
   friend class PersistentTabRestoreService;
 
-  // Populates the tab's navigations from the NavigationController, and its
-  // browser_id and pinned state from the browser.
+  // Populates the tab's navigations from the LiveTab, and its browser_id and
+  // pinned state from the delegate.
   void PopulateTab(Tab* tab,
                    int index,
                    TabRestoreServiceDelegate* delegate,
-                   content::NavigationController* controller);
+                   sessions::LiveTab* live_tab);
 
   // This is a helper function for RestoreEntryById() for restoring a single
   // tab. If |delegate| is NULL, this creates a new window for the entry. This
   // returns the TabRestoreServiceDelegate into which the tab was restored.
   // |disposition| will be respected, but if it is UNKNOWN then the tab's
   // original attributes will be respected instead. If a new
   // TabRestoreServiceDelegate needs to be created for this tab,
   // |host_desktop_type| will be passed to
   // TabRestoreServiceClient::CreateTabRestoreServiceDelegate(). If present,
-  // |contents| will be populated with the WebContents of the restored tab.
+  // |live_tab| will be populated with the LiveTab of the restored tab.
   TabRestoreServiceDelegate* RestoreTab(const Tab& tab,
                                         TabRestoreServiceDelegate* delegate,
                                         int host_desktop_type,
                                         WindowOpenDisposition disposition,
-                                        content::WebContents** contents);
+                                        sessions::LiveTab** live_tab);
 
   // 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.
   static bool ValidateTab(Tab* tab);
 
   // Validates all the tabs in a window, plus the window's active tab index.
   static bool ValidateWindow(Window* window);
 
   // Returns true if |tab| is one we care about restoring.
@@ skipping 32 matching lines @@
   // corresponding BrowserClosed. We cache the set of delegates closing to
   // avoid creating historical tabs for them.
   std::set<TabRestoreServiceDelegate*> closing_delegates_;
 
   TimeFactory* const time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_