Implement ID persistence for bookmarks:...

chrome/browser/bookmarks/bookmark_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 
 #include "build/build_config.h"
 
 #include <set>
@@ skipping 25 matching lines @@
 // BookmarkNode ---------------------------------------------------------------
 
 // BookmarkNode contains information about a starred entry: title, URL, favicon,
 // star id and type. BookmarkNodes are returned from a BookmarkModel.
 //
 class BookmarkNode : public views::TreeNode<BookmarkNode> {
   friend class BookmarkEditorView;
   friend class BookmarkModel;
   friend class BookmarkCodec;
   friend class history::StarredURLDatabase;
+  FRIEND_TEST(BookmarkCodecTest, PersistIDsTest);
   FRIEND_TEST(BookmarkEditorViewTest, ChangeParentAndURL);
   FRIEND_TEST(BookmarkEditorViewTest, EditURLKeepsPosition);
   FRIEND_TEST(BookmarkModelTest, MostRecentlyAddedEntries);
   FRIEND_TEST(BookmarkModelTest, GetMostRecentlyAddedNodeForURL);
 
  public:
+  // Creates a new node with the given properties. If the ID is not given or is
+  // 0, it is automatically assigned.
   BookmarkNode(BookmarkModel* model, const GURL& url);
+  BookmarkNode(BookmarkModel* model, int id, const GURL& url);
   virtual ~BookmarkNode() {}
 
   // Returns the favicon for the this node. If the favicon has not yet been
   // loaded it is loaded and the observer of the model notified when done.
   const SkBitmap& GetFavIcon();
 
   // Returns the URL.
   const GURL& GetURL() const { return url_; }
 
   // Returns a unique id for this node.
@@ skipping 22 matching lines @@
   // a node whose type is not URL.
   bool is_folder() const { return type_ != history::StarredEntry::URL; }
 
   // Is this a URL?
   bool is_url() const { return type_ == history::StarredEntry::URL; }
 
   // TODO(sky): Consider adding last visit time here, it'll greatly simplify
   // HistoryContentsProvider.
 
  private:
+  // Sets the next ID for bookmark node ID generation.
+  static void SetNextId(int next_id);
+
+  // helper to initialize various fields during construction.
+  void Initialize(BookmarkModel* model, int id);
+
   // Resets the properties of the node from the supplied entry.
   void Reset(const history::StarredEntry& entry);
 
+  // Sets the id to the given value.
+  void set_id(int id) { id_ = id; }
+
   // The model. This is NULL when created by StarredURLDatabase for migration.
   BookmarkModel* model_;
 
   // Unique identifier for this node.
-  const int id_;
+  int id_;
 
   // Whether the favicon has been loaded.
   bool loaded_favicon_;
 
   // The favicon.
   SkBitmap favicon_;
 
   // If non-zero, it indicates we're loading the favicon and this is the handle
   // from the HistoryService.
   HistoryService::Handle favicon_load_handle_;
@@ skipping 318 matching lines @@
   // NOTIFY_HISTORY_LOADED? A listener is installed if the bookmarks file
   // doesn't exist and the history service hasn't finished loading.
   bool waiting_for_history_load_;
 
   base::WaitableEvent loaded_signal_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_