components/sync_bookmarks/bookmark_model_associator.cc - Issue 2130453004: [Sync] Move //sync to //components/sync.

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 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 5 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:

View side-by-side diff with in-line comments

Download patch

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 a3fbf6382062c17bb096b5f05023ff9508100d16..7f238379c76fc75fed8fda592dee8a018848e88e 100644

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

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

@@ -20,22 +20,22 @@

#include "base/threading/thread_task_runner_handle.h"

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

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

+#include "components/sync/api/sync_error.h"

+#include "components/sync/api/sync_merge_result.h"

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

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

+#include "components/sync/core/delete_journal.h"

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

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

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

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

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

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

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

#include "components/sync_bookmarks/bookmark_change_processor.h"

#include "components/sync_driver/sync_client.h"

#include "components/undo/bookmark_undo_service.h"

#include "components/undo/bookmark_undo_utils.h"

-#include "sync/api/sync_error.h"

-#include "sync/api/sync_merge_result.h"

-#include "sync/internal_api/public/delete_journal.h"

-#include "sync/internal_api/public/read_node.h"

-#include "sync/internal_api/public/read_transaction.h"

-#include "sync/internal_api/public/write_node.h"

-#include "sync/internal_api/public/write_transaction.h"

-#include "sync/internal_api/syncapi_internal.h"

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

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

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

-#include "sync/util/data_type_histogram.h"

using bookmarks::BookmarkModel;

using bookmarks::BookmarkNode;

« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.h ('k') | components/sync_driver.gypi » ('j') | no next file with comments »