Makes all permanent nodes share the same node class so that visibility

chrome/browser/bookmarks/bookmark_storage.h

 // Copyright (c) 2011 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_STORAGE_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_
 #pragma once
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_index.h"
 #include "chrome/common/important_file_writer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class BookmarkModel;
-class BookmarkNode;
+class BookmarkPermanentNode;
 class Profile;
 
 // BookmarkLoadDetails is used by BookmarkStorage when loading bookmarks.
 // BookmarkModel creates a BookmarkLoadDetails and passes it (including
 // ownership) to BookmarkStorage. BoomarkStorage loads the bookmarks (and index)
 // in the background thread, then calls back to the BookmarkModel (on the main
 // thread) when loading is done, passing ownership back to the BookmarkModel.
 // While loading BookmarkModel does not maintain references to the contents
 // of the BookmarkLoadDetails, this ensures we don't have any threading
 // problems.
 class BookmarkLoadDetails {
  public:
-  BookmarkLoadDetails(BookmarkNode* bb_node,
-                      BookmarkNode* other_folder_node,
-                      BookmarkNode* mobile_folder_node,
+  BookmarkLoadDetails(BookmarkPermanentNode* bb_node,
+                      BookmarkPermanentNode* other_folder_node,
+                      BookmarkPermanentNode* mobile_folder_node,
                       BookmarkIndex* index,
                       int64 max_id);
   ~BookmarkLoadDetails();
 
-  BookmarkNode* bb_node() { return bb_node_.get(); }
-  BookmarkNode* release_bb_node() { return bb_node_.release(); }
-  BookmarkNode* mobile_folder_node() { return mobile_folder_node_.get(); }
-  BookmarkNode* release_mobile_folder_node() {
+  BookmarkPermanentNode* bb_node() { return bb_node_.get(); }
+  BookmarkPermanentNode* release_bb_node() { return bb_node_.release(); }
+  BookmarkPermanentNode* mobile_folder_node() {
+    return mobile_folder_node_.get();
+  }
+  BookmarkPermanentNode* release_mobile_folder_node() {
     return mobile_folder_node_.release();
   }
-  BookmarkNode* other_folder_node() { return other_folder_node_.get(); }
-  BookmarkNode* release_other_folder_node() {
+  BookmarkPermanentNode* other_folder_node() {
+    return other_folder_node_.get();
+  }
+  BookmarkPermanentNode* release_other_folder_node() {
     return other_folder_node_.release();
   }
   BookmarkIndex* index() { return index_.get(); }
   BookmarkIndex* release_index() { return index_.release(); }
 
   // Max id of the nodes.
   void set_max_id(int64 max_id) { max_id_ = max_id; }
   int64 max_id() const { return max_id_; }
 
   // Computed checksum.
   void set_computed_checksum(const std::string& value) {
     computed_checksum_ = value;
   }
   const std::string& computed_checksum() const { return computed_checksum_; }
 
   // Stored checksum.
   void set_stored_checksum(const std::string& value) {
     stored_checksum_ = value;
   }
   const std::string& stored_checksum() const { return stored_checksum_; }
 
   // Whether ids were reassigned. IDs are reassigned during decoding if the
   // checksum of the file doesn't match, some IDs are missing or not
   // unique. Basically, if the user modified the bookmarks directly we'll
   // reassign the ids to ensure they are unique.
   void set_ids_reassigned(bool value) { ids_reassigned_ = value; }
   bool ids_reassigned() const { return ids_reassigned_; }
 
  private:
-  scoped_ptr<BookmarkNode> bb_node_;
-  scoped_ptr<BookmarkNode> other_folder_node_;
-  scoped_ptr<BookmarkNode> mobile_folder_node_;
+  scoped_ptr<BookmarkPermanentNode> bb_node_;
+  scoped_ptr<BookmarkPermanentNode> other_folder_node_;
+  scoped_ptr<BookmarkPermanentNode> mobile_folder_node_;
   scoped_ptr<BookmarkIndex> index_;
   int64 max_id_;
   std::string computed_checksum_;
   std::string stored_checksum_;
   bool ids_reassigned_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkLoadDetails);
 };
 
 // BookmarkStorage handles reading/write the bookmark bar model. The
@@ skipping 71 matching lines @@
   // Path to temporary file created during migrating bookmarks from history.
   const FilePath tmp_history_path_;
 
   // See class description of BookmarkLoadDetails for details on this.
   scoped_ptr<BookmarkLoadDetails> details_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_