Moves TabNavigation into components/sessions and renames

chrome/browser/sessions/session_service.h

 // Copyright (c) 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_SESSION_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 31 matching lines @@
 //
 // SessionService supports restoring from the last session. The last session
 // typically corresponds to the last run of the browser, but not always. For
 // example, if the user has a tabbed browser and app window running, closes the
 // tabbed browser, then creates a new tabbed browser the current session is made
 // the last session and the current session reset. This is done to provide the
 // illusion that app windows run in separate processes. Similar behavior occurs
 // with incognito windows.
 //
 // SessionService itself maintains a set of SessionCommands that allow
-// SessionService to rebuild the open state of the browser (as
-// SessionWindow, SessionTab and TabNavigation). The commands are periodically
+// SessionService to rebuild the open state of the browser (as SessionWindow,
+// SessionTab and SerializedNavigationEntry). The commands are periodically
 // flushed to SessionBackend and written to a file. Every so often
-// SessionService rebuilds the contents of the file from the open state
-// of the browser.
+// SessionService rebuilds the contents of the file from the open state of the
+// browser.
 class SessionService : public BaseSessionService,
                        public ProfileKeyedService,
                        public content::NotificationObserver,
                        public chrome::BrowserListObserver {
   friend class SessionServiceTestHelper;
  public:
   // Used to distinguish an application window from a normal one.
   enum AppType {
     TYPE_APP,
     TYPE_NORMAL
@@ skipping 85 matching lines @@
                                        const SessionID& tab_id,
                                        int count);
 
   // Invoked when the NavigationController has removed entries from the front of
   // the list. |count| gives the number of entries that were removed.
   void TabNavigationPathPrunedFromFront(const SessionID& window_id,
                                         const SessionID& tab_id,
                                         int count);
 
   // Updates the navigation entry for the specified tab.
-  void UpdateTabNavigation(const SessionID& window_id,
-                           const SessionID& tab_id,
-                           const TabNavigation& navigation);
+  void UpdateTabNavigation(
+      const SessionID& window_id,
+      const SessionID& tab_id,
+      const sessions::SerializedNavigationEntry& navigation);
 
   // Notification that a tab has restored its entries or a closed tab is being
   // reused.
   void TabRestored(content::WebContents* tab, bool pinned);
 
   // Sets the index of the selected entry in the navigation controller for the
   // specified tab.
   void SetSelectedNavigationIndex(const SessionID& window_id,
                                   const SessionID& tab_id,
                                   int index);
@@ skipping 126 matching lines @@
   // Returns the tab with the specified id in tabs. If a tab does not exist,
   // it is created.
   SessionTab* GetTab(SessionID::id_type tab_id,
                      IdToSessionTab* tabs);
 
   // Returns an iterator into navigations pointing to the navigation whose
   // index matches |index|. If no navigation index matches |index|, the first
   // navigation with an index > |index| is returned.
   //
   // This assumes the navigations are ordered by index in ascending order.
-  std::vector<TabNavigation>::iterator FindClosestNavigationWithIndex(
-      std::vector<TabNavigation>* navigations,
+  std::vector<sessions::SerializedNavigationEntry>::iterator
+  FindClosestNavigationWithIndex(
+      std::vector<sessions::SerializedNavigationEntry>* navigations,
       int index);
 
   // Does the following:
   // . Deletes and removes any windows with no tabs or windows with types other
   //   than tabbed_browser or browser. NOTE: constrained windows that have
   //   been dragged out are of type browser. As such, this preserves any dragged
   //   out constrained windows (aka popups that have been dragged out).
   // . Sorts the tabs in windows with valid tabs based on the tabs
   //   visual order, and adds the valid windows to windows.
   void SortTabsBasedOnVisualOrderAndPrune(
@@ skipping 171 matching lines @@
   const base::TimeDelta save_delay_in_hrs_;
 
   // For browser_tests, since we want to simulate the browser shutting down
   // without quitting.
   bool force_browser_not_alive_with_no_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_