components/sync_bookmarks/bookmark_model_associator.cc - Issue 2413313004: [Sync] Move the last things out of core/.

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_bookmarks/bookmark_model_associator.cc

Issue 2413313004: [Sync] Move the last things out of core/. (Closed)

Patch Set: Address comments. 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_bookmarks/bookmark_model_associator.cc

diff --git a/components/sync_bookmarks/bookmark_model_associator.cc b/components/sync_bookmarks/bookmark_model_associator.cc

index 8bbf65961618f094ecdfb9992df3ca1e097ec37c..cc8532c4c1ca68c6fb912a69c33aea08129a1bb2 100644

--- a/components/sync_bookmarks/bookmark_model_associator.cc

+++ b/components/sync_bookmarks/bookmark_model_associator.cc

@@ -20,8 +20,8 @@

#include "components/bookmarks/browser/bookmark_model.h"

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

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

-#include "components/sync/core_impl/syncapi_internal.h"

#include "components/sync/driver/sync_client.h"

+#include "components/sync/engine/engine_util.h"

#include "components/sync/model/sync_error.h"

#include "components/sync/model/sync_merge_result.h"

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

« no previous file with comments | « components/sync/tools/sync_client.cc ('k') | components/wifi_sync/DEPS » ('j') | no next file with comments »