chrome/browser/sync/syncable/directory_manager.h - Issue 8770032: [Sync] Implement encryption-aware conflict resolution.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/syncable/directory_manager.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:

Index: chrome/browser/sync/syncable/directory_manager.h

diff --git a/chrome/browser/sync/syncable/directory_manager.h b/chrome/browser/sync/syncable/directory_manager.h

index 29420edeac1c636569fe348ff540db5987defd57..ec36276d0de5bd394ec9ccfca6776a955a2c28b6 100644

--- a/chrome/browser/sync/syncable/directory_manager.h

+++ b/chrome/browser/sync/syncable/directory_manager.h

@@ -18,10 +18,10 @@

#include "base/basictypes.h"

#include "base/file_path.h"

+#include "base/memory/scoped_ptr.h"

#include "base/synchronization/lock.h"

#include "chrome/browser/sync/syncable/dir_open_result.h"

#include "chrome/browser/sync/syncable/syncable.h"

-#include "chrome/browser/sync/util/cryptographer.h"

#include "chrome/browser/sync/util/weak_handle.h"

namespace browser_sync { class Cryptographer; }