components/sync/core_impl/sync_encryption_handler_impl.cc - Issue 2407163004: [Sync] Move some directory-related things from core/ to syncable/.

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: components/sync/core_impl/sync_encryption_handler_impl.cc

Issue 2407163004: [Sync] Move some directory-related things from core/ to syncable/. (Closed)

Patch Set: Created 4 years, 2 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:

Index: components/sync/core_impl/sync_encryption_handler_impl.cc

diff --git a/components/sync/core_impl/sync_encryption_handler_impl.cc b/components/sync/core_impl/sync_encryption_handler_impl.cc

index dc935a9197f7ef67eaa848de1fec4a55f535ac83..d431c491ca3789a7ef250729f61e4055a668e56b 100644

--- a/components/sync/core_impl/sync_encryption_handler_impl.cc

+++ b/components/sync/core_impl/sync_encryption_handler_impl.cc

@@ -22,11 +22,6 @@

#include "components/sync/base/experiments.h"

#include "components/sync/base/passphrase_type.h"

#include "components/sync/base/time.h"

-#include "components/sync/core/read_node.h"

-#include "components/sync/core/read_transaction.h"

-#include "components/sync/core/user_share.h"

-#include "components/sync/core/write_node.h"

-#include "components/sync/core/write_transaction.h"

#include "components/sync/engine/sync_string_conversions.h"

#include "components/sync/protocol/encryption.pb.h"

#include "components/sync/protocol/nigori_specifics.pb.h"

@@ -35,9 +30,14 @@

#include "components/sync/syncable/entry.h"

#include "components/sync/syncable/mutable_entry.h"

#include "components/sync/syncable/nigori_util.h"

+#include "components/sync/syncable/read_node.h"

+#include "components/sync/syncable/read_transaction.h"

#include "components/sync/syncable/syncable_base_transaction.h"

#include "components/sync/syncable/syncable_model_neutral_write_transaction.h"

#include "components/sync/syncable/syncable_write_transaction.h"

+#include "components/sync/syncable/user_share.h"

+#include "components/sync/syncable/write_node.h"

+#include "components/sync/syncable/write_transaction.h"

namespace syncer {