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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/syncable/syncable.h

Issue 8770032: [Sync] Implement encryption-aware conflict resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split out nigori conflict code and rebase 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
« chrome/browser/sync/engine/syncer_unittest.cc ('K') | « chrome/browser/sync/syncable/directory_manager.h ('k') | chrome/browser/sync/syncable/syncable_columns.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/syncable.h
diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h
index 3ab7e3f4000bab67e970c7d4e82188f06c1307e5..ef3c05dab5445e21d112262d27e25373227e2529 100644
--- a/chrome/browser/sync/syncable/syncable.h
+++ b/chrome/browser/sync/syncable/syncable.h
@@ -177,6 +177,7 @@ enum {
enum ProtoField {
SPECIFICS = PROTO_FIELDS_BEGIN,
SERVER_SPECIFICS,
+ PREV_SERVER_SPECIFICS,
PROTO_FIELDS_END,
};
@@ -738,7 +739,6 @@ struct Index {
// be held before acquiring the kernel lock.
class ScopedKernelLock;
class IdFilter;
-class DirectoryManager;
class Directory {
friend class BaseTransaction;
« chrome/browser/sync/engine/syncer_unittest.cc ('K') | « chrome/browser/sync/syncable/directory_manager.h ('k') | chrome/browser/sync/syncable/syncable_columns.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698