components/sync_driver/model_association_manager.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_driver/model_association_manager.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:

Index: components/sync_driver/model_association_manager.cc

diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc

index 6fe27102d6220e797589a3e4a602c48842683af0..0c69b7bb180f77ff8f1547ecd0d02954fe845e4c 100644

--- a/components/sync_driver/model_association_manager.cc

+++ b/components/sync_driver/model_association_manager.cc

@@ -15,8 +15,8 @@

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram_macros.h"

#include "base/trace_event/trace_event.h"

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

-#include "sync/internal_api/public/base/model_type.h"

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

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

using syncer::ModelTypeSet;