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

Unified Diff: chrome/browser/extensions/app_notification_manager.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
« no previous file with comments | « no previous file | chrome/browser/extensions/app_notification_manager_sync_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/app_notification_manager.cc
diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc
index 6b1566af8879098a925e3a4ab6cbb7e52ec1c07c..fd40bdade9addc4544fd5f83961efb1c900ae02a 100644
--- a/chrome/browser/extensions/app_notification_manager.cc
+++ b/chrome/browser/extensions/app_notification_manager.cc
@@ -338,7 +338,9 @@ syncer::SyncError AppNotificationManager::MergeDataAndStartSyncing(
for (SyncDataMap::const_iterator iter = local_data_map.begin();
iter != local_data_map.end(); ++iter) {
new_changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_ADD, iter->second));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_ADD,
+ iter->second));
}
syncer::SyncError error;
@@ -494,7 +496,9 @@ void AppNotificationManager::SyncAddChange(const AppNotification& notif) {
syncer::SyncChangeList changes;
syncer::SyncData sync_data = CreateSyncDataFromNotification(notif);
changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_ADD, sync_data));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_ADD,
+ sync_data));
sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
}
@@ -509,7 +513,9 @@ void AppNotificationManager::SyncRemoveChange(const AppNotification& notif) {
syncer::SyncChangeList changes;
syncer::SyncData sync_data = CreateSyncDataFromNotification(notif);
changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_DELETE, sync_data));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_DELETE,
+ sync_data));
sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
}
@@ -529,6 +535,7 @@ void AppNotificationManager::SyncClearAllChange(
if (notif.is_local())
continue;
changes.push_back(syncer::SyncChange(
+ FROM_HERE,
syncer::SyncChange::ACTION_DELETE,
CreateSyncDataFromNotification(notif)));
}
« no previous file with comments | « no previous file | chrome/browser/extensions/app_notification_manager_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698