| Index: components/bookmarks/browser/bookmark_storage.h
|
| diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h
|
| index a3d5924333c6a118a144d615ab866e0f4ce6ea9f..4910d53bc1cdfaa6f0139c57e9641b8a62936c03 100644
|
| --- a/components/bookmarks/browser/bookmark_storage.h
|
| +++ b/components/bookmarks/browser/bookmark_storage.h
|
| @@ -15,6 +15,7 @@ class BookmarkIndex;
|
| class BookmarkModel;
|
|
|
| namespace base {
|
| +class ListValue;
|
| class SequencedTaskRunner;
|
| }
|
|
|
| @@ -33,6 +34,7 @@ class BookmarkLoadDetails {
|
| BookmarkLoadDetails(BookmarkPermanentNode* bb_node,
|
| BookmarkPermanentNode* other_folder_node,
|
| BookmarkPermanentNode* mobile_folder_node,
|
| + BookmarkPermanentNode* managed_node,
|
| BookmarkIndex* index,
|
| int64 max_id);
|
| ~BookmarkLoadDetails();
|
| @@ -51,6 +53,10 @@ class BookmarkLoadDetails {
|
| BookmarkPermanentNode* release_other_folder_node() {
|
| return other_folder_node_.release();
|
| }
|
| + BookmarkPermanentNode* managed_node() { return managed_node_.get(); }
|
| + BookmarkPermanentNode* release_managed_node() {
|
| + return managed_node_.release();
|
| + }
|
| BookmarkIndex* index() { return index_.get(); }
|
| BookmarkIndex* release_index() { return index_.release(); }
|
|
|
| @@ -95,6 +101,7 @@ class BookmarkLoadDetails {
|
| scoped_ptr<BookmarkPermanentNode> bb_node_;
|
| scoped_ptr<BookmarkPermanentNode> other_folder_node_;
|
| scoped_ptr<BookmarkPermanentNode> mobile_folder_node_;
|
| + scoped_ptr<BookmarkPermanentNode> managed_node_;
|
| scoped_ptr<BookmarkIndex> index_;
|
| BookmarkNode::MetaInfoMap model_meta_info_map_;
|
| int64 model_sync_transaction_version_;
|
| @@ -126,6 +133,7 @@ class BookmarkStorage : public base::ImportantFileWriter::DataSerializer,
|
| // a task in |task_runner|. See BookmarkLoadDetails for details.
|
| void LoadBookmarks(
|
| scoped_ptr<BookmarkLoadDetails> details,
|
| + scoped_ptr<base::ListValue> initial_managed_bookmarks,
|
| const scoped_refptr<base::SequencedTaskRunner>& task_runner);
|
|
|
| // Schedules saving the bookmark bar model to disk.
|
|
|