Revamp TabNavigation class

chrome/browser/sync/glue/session_model_associator.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_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 404 matching lines @@
   // if no page is found to be referring to the favicon anymore.
   void DecrementAndCleanFaviconForURL(const std::string& page_url);
 
   // Helper method to build sync's tab specifics from a newly modified
   // tab, window, and the locally stored previous tab data. After completing,
   // |prev_tab| will be updated to reflect the current data, |sync_tab| will
   // be filled with the tab data (preserving old timestamps as necessary), and
   // |new_url| will be the tab's current url.
   void AssociateTabContents(const SyncedWindowDelegate& window,
                             const SyncedTabDelegate& new_tab,
-                            SyncedSessionTab* prev_tab,
+                            SessionTab* prev_tab,
                             sync_pb::SessionTab* sync_tab,
                             GURL* new_url);
 
   // Load the favicon for the tab specified by |tab_link|. Will cancel any
   // outstanding request for this tab. OnFaviconDataAvailable(..) will be called
   // when the load completes.
   void LoadFaviconForTab(TabLink* tab_link);
 
   // Callback method to store a tab's favicon into its sync node once it becomes
   // available. Does nothing if no favicon data was available.
@@ skipping 13 matching lines @@
   static void PopulateSessionWindowFromSpecifics(
       const std::string& foreign_session_tag,
       const sync_pb::SessionWindow& window,
       const base::Time& mtime,
       SessionWindow* session_window,
       SyncedSessionTracker* tracker);
 
   // Used to populate a session tab from the session specifics tab provided.
   static void PopulateSessionTabFromSpecifics(const sync_pb::SessionTab& tab,
                                               const base::Time& mtime,
-                                              SyncedSessionTab* session_tab);
+                                              SessionTab* session_tab);
 
   // Helper method to load the favicon data from the tab specifics. If the
   // favicon is valid, stores the favicon data and increments the usage counter
   // in |synced_favicons_| and updates |synced_favicon_pages_| appropriately.
   void LoadForeignTabFavicon(const sync_pb::SessionTab& tab);
 
-  // Append a new navigation from sync specifics onto |tab| navigation vectors.
-  static void AppendSessionTabNavigation(
-     const sync_pb::TabNavigation& navigation,
-     SyncedSessionTab* tab);
-
-  // Populates the navigation portion of the session specifics.
-  static void PopulateSessionSpecificsNavigation(
-     const content::NavigationEntry& navigation,
-     sync_pb::TabNavigation* tab_navigation);
-
   // Returns true if this tab belongs to this profile and belongs to a window,
   // false otherwise.
   bool IsValidTab(const SyncedTabDelegate& tab) const;
 
   // Having a valid entry is defined as the url being valid and and having a
   // syncable scheme (non chrome:// and file:// url's). In other words, we don't
   // want to sync a tab that is nothing but chrome:// and file:// navigations or
   // invalid url's.
   bool TabHasValidEntry(const SyncedTabDelegate& tab) const;
 
@@ skipping 73 matching lines @@
   std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_;
   // Map of page URL -> favicon url.
   std::map<std::string, std::string> synced_favicon_pages_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_