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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/engine/conflict_resolver.h

Issue 8917031: [Sync] Add nigori node conflict resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add some lines lost in the split Created 9 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
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/conflict_resolver.cc » ('j') | chrome/browser/sync/engine/conflict_resolver.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/conflict_resolver.h
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index c622794a89086034fc37679af7b0457fd9c5bfb6..acc37d908fd55b096e1ab1821f766f08f7bebda7 100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -27,6 +27,8 @@ class WriteTransaction;
namespace browser_sync {
+class Cryptographer;
+
namespace sessions {
class ConflictProgress;
class StatusController;
@@ -70,6 +72,7 @@ class ConflictResolver {
ProcessSimpleConflictResult ProcessSimpleConflict(
syncable::WriteTransaction* trans,
const syncable::Id& id,
+ const Cryptographer* cryptographer,
sessions::StatusController* status);
bool ResolveSimpleConflicts(const syncable::ScopedDirLookup& dir,
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/conflict_resolver.cc » ('j') | chrome/browser/sync/engine/conflict_resolver.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698