components/sync/driver/model_association_manager.cc - Issue 2401223002: [Sync] Renaming sync/api* to sync/model*.

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 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)

Patch Set: Missed a comment in a DEPS file, and rebasing. 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/driver/model_association_manager.cc

diff --git a/components/sync/driver/model_association_manager.cc b/components/sync/driver/model_association_manager.cc

index 14d0b4a9961c36c167bddd0b42e8d445f0219d43..382c4f1d33bd98d6ec39ccbfa1075a8da02d173d 100644

--- a/components/sync/driver/model_association_manager.cc

+++ b/components/sync/driver/model_association_manager.cc

@@ -14,8 +14,8 @@

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram_macros.h"

#include "base/trace_event/trace_event.h"

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

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

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

namespace syncer {