| Index: chrome/browser/sync/glue/bookmark_model_associator.h
|
| diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h
|
| index 541a54a3b72c8a41961d1f2ca7e703a11f0d5af7..1416a2cff18eeaa42a99a30e00467de739b6850e 100644
|
| --- a/chrome/browser/sync/glue/bookmark_model_associator.h
|
| +++ b/chrome/browser/sync/glue/bookmark_model_associator.h
|
| @@ -22,6 +22,7 @@ class BookmarkNode;
|
|
|
| namespace syncer {
|
| class BaseNode;
|
| +class BaseTransaction;
|
| struct UserShare;
|
| }
|
|
|
| @@ -118,6 +119,11 @@ class BookmarkModelAssociator
|
| syncer::SyncMergeResult* local_merge_result,
|
| syncer::SyncMergeResult* syncer_merge_result);
|
|
|
| + // Removes bookmark nodes whose corresponding sync nodes have been deleted
|
| + // according to sync delete journals. Return number of such bookmarks nodes
|
| + // found.
|
| + int64 ApplyDeletesFromSyncJournal(syncer::BaseTransaction* trans);
|
| +
|
| // Associate a top-level node of the bookmark model with a permanent node in
|
| // the sync domain. Such permanent nodes are identified by a tag that is
|
| // well known to the server and the client, and is unique within a particular
|
|
|