chrome/browser/sync/glue/bookmark_model_associator.cc - Issue 8396022: [Sync] Add HasChildren() function and use it instead of GetFirstChildId()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8396022: [Sync] Add HasChildren() function and use it instead of GetFirstChildId() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 2 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') | chrome/browser/sync/glue/generic_change_processor.cc » ('j') | chrome/browser/sync/syncable/syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 720632cf91bab4c6961ba12ededd6f0aeb3fd69c..0e307c12fe8110102275fc47c291291cb9edcbe5 100644

--- a/chrome/browser/sync/glue/bookmark_model_associator.cc

+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc

@@ -275,10 +275,9 @@ bool BookmarkModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {

// Sync model has user created nodes if either one of the permanent nodes

// has children.

- *has_nodes = bookmark_bar_node.GetFirstChildId() != sync_api::kInvalidId ||

- other_bookmarks_node.GetFirstChildId() != sync_api::kInvalidId ||

- (has_synced_folder &&

- synced_bookmarks_node.GetFirstChildId() != sync_api::kInvalidId);

+ *has_nodes = bookmark_bar_node.HasChildren() ||

+ other_bookmarks_node.HasChildren() ||

+ (has_synced_folder && synced_bookmarks_node.HasChildren());

return true;

}