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

Unified Diff: chrome/browser/webdata/autofill_profile_syncable_service.cc

Issue 10690128: Reland r145993. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/webdata/autofill_profile_syncable_service.cc
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc
index 1eed62ea30ea351a4f3f687937bbea3a4f16c63e..48291f53ab54fc64e0697598ee488d411fb6199f 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc
@@ -140,15 +140,17 @@ syncer::SyncError AutofillProfileSyncableService::MergeDataAndStartSyncing(
for (GUIDToProfileMap::iterator i = remaining_profiles.begin();
i != remaining_profiles.end(); ++i) {
new_changes.push_back(
- syncer::SyncChange(
- syncer::SyncChange::ACTION_ADD, CreateData(*(i->second))));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_ADD,
+ CreateData(*(i->second))));
profiles_map_[i->first] = i->second;
}
for (size_t i = 0; i < bundle.profiles_to_sync_back.size(); ++i) {
new_changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE,
- CreateData(*(bundle.profiles_to_sync_back[i]))));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_UPDATE,
+ CreateData(*(bundle.profiles_to_sync_back[i]))));
}
syncer::SyncError error;
@@ -434,8 +436,9 @@ void AutofillProfileSyncableService::ActOnChange(
switch (change.type()) {
case AutofillProfileChange::ADD:
new_changes.push_back(
- syncer::SyncChange(
- syncer::SyncChange::ACTION_ADD, CreateData(*(change.profile()))));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_ADD,
+ CreateData(*(change.profile()))));
DCHECK(profiles_map_.find(change.profile()->guid()) ==
profiles_map_.end());
profiles_.push_back(new AutofillProfile(*(change.profile())));
@@ -447,14 +450,16 @@ void AutofillProfileSyncableService::ActOnChange(
DCHECK(it != profiles_map_.end());
*(it->second) = *(change.profile());
new_changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE,
- CreateData(*(change.profile()))));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_UPDATE,
+ CreateData(*(change.profile()))));
break;
}
case AutofillProfileChange::REMOVE: {
AutofillProfile empty_profile(change.key());
new_changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_DELETE,
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_DELETE,
CreateData(empty_profile)));
profiles_map_.erase(change.key());
break;

Powered by Google App Engine
This is Rietveld 408576698