BookmarkClient can add extra nodes to BookmarkModel.

components/bookmarks/browser/bookmark_storage.h

 // Copyright 2014 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 COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_
 
+#include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/files/important_file_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 
 class BookmarkModel;
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace bookmarks {
 
 class BookmarkIndex;
 
+// A list of BookmarkPermanentNodes that owns them.
+typedef ScopedVector<BookmarkPermanentNode> BookmarkPermanentNodeList;
+
+// A callback that generates a BookmarkPermanentNodeList, given a max ID to
+// use. The max ID argument will be updated after any new nodes have been
+// created and assigned IDs.
+typedef base::Callback<BookmarkPermanentNodeList(int64*)> LoadExtraCallback;
+
 // BookmarkLoadDetails is used by BookmarkStorage when loading bookmarks.
 // BookmarkModel creates a BookmarkLoadDetails and passes it (including
 // ownership) to BookmarkStorage. BookmarkStorage 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(BookmarkPermanentNode* bb_node,
                       BookmarkPermanentNode* other_folder_node,
                       BookmarkPermanentNode* mobile_folder_node,
+                      const LoadExtraCallback& load_extra_callback,
                       BookmarkIndex* index,
                       int64 max_id);
   ~BookmarkLoadDetails();
 
+  void LoadExtraNodes();
+
   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();
   }
   BookmarkPermanentNode* other_folder_node() {
     return other_folder_node_.get();
   }
   BookmarkPermanentNode* release_other_folder_node() {
     return other_folder_node_.release();
   }
+  const BookmarkPermanentNodeList& extra_nodes() {
+    return extra_nodes_;
+  }
+  void release_extra_nodes(std::vector<BookmarkPermanentNode*>* extra_nodes) {
+    extra_nodes_.release(extra_nodes);
+  }
   BookmarkIndex* index() { return index_.get(); }
   BookmarkIndex* release_index() { return index_.release(); }
 
   const BookmarkNode::MetaInfoMap& model_meta_info_map() const {
     return model_meta_info_map_;
   }
   void set_model_meta_info_map(const BookmarkNode::MetaInfoMap& meta_info_map) {
     model_meta_info_map_ = meta_info_map;
   }
 
@@ skipping 24 matching lines @@
   // 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<BookmarkPermanentNode> bb_node_;
   scoped_ptr<BookmarkPermanentNode> other_folder_node_;
   scoped_ptr<BookmarkPermanentNode> mobile_folder_node_;
+  LoadExtraCallback load_extra_callback_;
+  BookmarkPermanentNodeList extra_nodes_;
   scoped_ptr<BookmarkIndex> index_;
   BookmarkNode::MetaInfoMap model_meta_info_map_;
   int64 model_sync_transaction_version_;
   int64 max_id_;
   std::string computed_checksum_;
   std::string stored_checksum_;
   bool ids_reassigned_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkLoadDetails);
 };
@@ skipping 53 matching lines @@
 
   // Sequenced task runner where file I/O operations will be performed at.
   scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_