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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/conflict_resolver.h

Issue 10825137: FYI: Control Data + Per-Device Metadata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add PER_USER_METADATA, refactor some encryption code Created 8 years, 4 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
« sync/engine/apply_updates_command_unittest.cc ('K') | « sync/engine/apply_updates_command_unittest.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | sync/internal_api/public/base/model_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/conflict_resolver.h
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h
index 2efb1e94fa8540f348c0234f295b0926ddd294c0..7e5be74221227559219e7d759d4f89d49b3ab677 100644
--- a/sync/engine/conflict_resolver.h
+++ b/sync/engine/conflict_resolver.h
@@ -65,10 +65,6 @@ class ConflictResolver {
SYNC_PROGRESS, // Progress made.
};
- void IgnoreLocalChanges(syncable::MutableEntry* entry);
rlarocque 2012/08/11 01:31:52 Moved to syncer_util.h
- void OverwriteServerChanges(syncable::WriteTransaction* trans,
- syncable::MutableEntry* entry);
-
ProcessSimpleConflictResult ProcessSimpleConflict(
syncable::WriteTransaction* trans,
const syncable::Id& id,
« sync/engine/apply_updates_command_unittest.cc ('K') | « sync/engine/apply_updates_command_unittest.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | sync/internal_api/public/base/model_type.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698