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

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

Issue 11533008: Use delete journal to remove bookmarks that are already deleted in sync model (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
Index: chrome/browser/sync/glue/generic_change_processor.cc
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
index c12e34ff45e50eec6c3f2ab19e613491ba6a44c7..e37d575eca08514aa4cc25c2167481a5a691fcb0 100644
--- a/chrome/browser/sync/glue/generic_change_processor.cc
+++ b/chrome/browser/sync/glue/generic_change_processor.cc
@@ -53,7 +53,8 @@ void GenericChangeProcessor::ApplyChangesFromSyncModel(
syncer::SyncChange(
FROM_HERE,
syncer::SyncChange::ACTION_DELETE,
- syncer::SyncData::CreateRemoteData(it->id, it->specifics)));
+ syncer::SyncData::CreateRemoteData(it->id, it->specifics,
+ false)));
} else {
syncer::SyncChange::SyncChangeType action =
(it->action == syncer::ChangeRecord::ACTION_ADD) ?
@@ -72,7 +73,8 @@ void GenericChangeProcessor::ApplyChangesFromSyncModel(
FROM_HERE,
action,
syncer::SyncData::CreateRemoteData(
- it->id, read_node.GetEntitySpecifics())));
+ it->id, read_node.GetEntitySpecifics(),
+ read_node.GetIsFolder())));
}
}
}
@@ -127,7 +129,8 @@ syncer::SyncError GenericChangeProcessor::GetSyncDataForType(
return error;
}
current_sync_data->push_back(syncer::SyncData::CreateRemoteData(
- sync_child_node.GetId(), sync_child_node.GetEntitySpecifics()));
+ sync_child_node.GetId(), sync_child_node.GetEntitySpecifics(),
+ sync_child_node.GetIsFolder()));
sync_child_id = sync_child_node.GetSuccessorId();
}
return syncer::SyncError();

Powered by Google App Engine
This is Rietveld 408576698