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

Unified Diff: sync/engine/commit_processor.cc

Issue 161253002: sync: Add interfaces for per-type sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another win compile fix Created 6 years, 10 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 | « sync/engine/commit_processor.h ('k') | sync/engine/directory_commit_contribution.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/commit_processor.cc
diff --git a/sync/engine/commit_processor.cc b/sync/engine/commit_processor.cc
index c54217b0954534ebb1add5f86ad4afee1f489ed4..d9bd423bb996587841a02ba9e8a9b86bd9cd066f 100644
--- a/sync/engine/commit_processor.cc
+++ b/sync/engine/commit_processor.cc
@@ -6,8 +6,8 @@
#include <map>
-#include "sync/engine/sync_directory_commit_contribution.h"
-#include "sync/engine/sync_directory_commit_contributor.h"
+#include "sync/engine/commit_contribution.h"
+#include "sync/engine/commit_contributor.h"
#include "sync/protocol/sync.pb.h"
namespace syncer {
@@ -35,11 +35,11 @@ void CommitProcessor::GatherCommitContributions(
continue;
}
size_t spaces_remaining = max_entries - num_entries;
- SyncDirectoryCommitContribution* contribution =
+ scoped_ptr<CommitContribution> contribution =
cm_it->second->GetContribution(spaces_remaining);
if (contribution) {
num_entries += contribution->GetNumEntries();
- contributions->insert(std::make_pair(it.Get(), contribution));
+ contributions->insert(std::make_pair(it.Get(), contribution.release()));
}
if (num_entries >= max_entries) {
DCHECK_EQ(num_entries, max_entries)
« no previous file with comments | « sync/engine/commit_processor.h ('k') | sync/engine/directory_commit_contribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698