Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2947)

Unified Diff: chrome/browser/sync/glue/bookmark_model_associator.cc

Issue 319133007: Documented that the new nodes at the root aren't meant to sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index ede4307e9f026356ac1ae998b09b99fa30718992..e1ee96220ec4a192068125769171b3b2885f0f13 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -246,6 +246,9 @@ void BookmarkModelAssociator::UpdatePermanentNodeVisibility() {
bookmark_node_types[i],
id_map_.find(id) != id_map_.end());
}
+
+ // Note: the root node may have additional extra nodes. Currently their
+ // visibility is not affected by sync.
}
syncer::SyncError BookmarkModelAssociator::DisassociateModels() {
@@ -463,6 +466,9 @@ syncer::SyncError BookmarkModelAssociator::BuildAssociations(
model_type());
}
+ // Note: the root node may have additional extra nodes. Currently none of
+ // them are meant to sync.
+
int64 bookmark_bar_sync_id = GetSyncIdFromChromeId(
bookmark_model_->bookmark_bar_node()->id());
DCHECK_NE(bookmark_bar_sync_id, syncer::kInvalidId);
@@ -615,6 +621,8 @@ int64 BookmarkModelAssociator::ApplyDeletesFromSyncJournal(
dfs_stack.push(bookmark_model_->other_node());
if (expect_mobile_bookmarks_folder_)
dfs_stack.push(bookmark_model_->mobile_node());
+ // Note: the root node may have additional extra nodes. Currently none of
+ // them are meant to sync.
// Remember folders that match delete journals in first pass but don't delete
// them in case there are bookmarks left under them. After non-folder
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698