[Sync] Refactor handling of session tabs

chrome/browser/sessions/session_types.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_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "googleurl/src/gurl.h"
@@ skipping 33 matching lines @@
   static TabNavigation FromNavigationEntry(
       int index,
       const content::NavigationEntry& entry,
       base::Time timestamp);
 
   // Construct a TabNavigation for a particular index from a sync
   // protocol buffer.  Note that the sync protocol buffer doesn't
   // contain all TabNavigation fields.
   static TabNavigation FromSyncData(
       int index,
-      const sync_pb::TabNavigation& specifics);
+      const sync_pb::TabNavigation& sync_data);
 
   // Note that not all TabNavigation fields are preserved.
   void WriteToPickle(Pickle* pickle) const;
   bool ReadFromPickle(PickleIterator* iterator);
 
   // Convert this TabNavigation into a NavigationEntry with the given
   // page ID and context.  The NavigationEntry will have a transition
   // type of PAGE_TRANSITION_RELOAD and a new unique ID.
   scoped_ptr<content::NavigationEntry> ToNavigationEntry(
       int page_id,
@@ skipping 51 matching lines @@
   //
   // TODO(akalin): Add a timestamp field to NavigationEntry.
   base::Time timestamp_;
 };
 
 // SessionTab ----------------------------------------------------------------
 
 // SessionTab corresponds to a NavigationController.
 struct SessionTab {
   SessionTab();
-  virtual ~SessionTab();
+  ~SessionTab();
 
   // Since the current_navigation_index can be larger than the index for number
   // of navigations in the current sessions (chrome://newtab is not stored), we
   // must perform bounds checking.
   // Returns a normalized bounds-checked navigation_index.
   int normalized_navigation_index() const {
     return std::max(0, std::min(current_navigation_index,
                                 static_cast<int>(navigations.size() - 1)));
   }
 
+  // Set all the fields of this object from the given sync data and
+  // timestamp.  Uses TabNavigation::FromSyncData to fill
+  // |navigations|.  Note that the sync protocol buffer doesn't
+  // contain all TabNavigation fields.
+  void SetFromSyncData(const sync_pb::SessionTab& sync_data,
+                       base::Time timestamp);
+
+  // Convert this object into its sync protocol buffer equivalent.
+  // Uses TabNavigation::ToSyncData to convert |navigations|.  Note
+  // that the protocol buffer doesn't contain all TabNavigation
+  // fields, and that the returned protocol buffer doesn't have any
+  // favicon data.
+  sync_pb::SessionTab ToSyncData() const;
+
   // Unique id of the window.
   SessionID window_id;
 
   // Unique if of the tab.
   SessionID tab_id;
 
   // Visual index of the tab within its window. There may be gaps in these
   // values.
   //
   // NOTE: this is really only useful for the SessionService during
@@ skipping 77 matching lines @@
   // Is the window maximized, minimized, or normal?
   ui::WindowShowState show_state;
 
   std::string app_name;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionWindow);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_