components/sync/engine_impl/conflict_util.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/engine_impl/conflict_util.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/engine_impl/conflict_util.cc

diff --git a/sync/engine/conflict_util.cc b/components/sync/engine_impl/conflict_util.cc

similarity index 94%

rename from sync/engine/conflict_util.cc

rename to components/sync/engine_impl/conflict_util.cc

index dd4457b6bd5b2cda86158271664f8ba23c9edf09..5dbb60739ad0b7d87ff69f8bd4da307c223fa2b9 100644

--- a/sync/engine/conflict_util.cc

+++ b/components/sync/engine_impl/conflict_util.cc

@@ -2,9 +2,9 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "sync/engine/conflict_util.h"

+#include "components/sync/engine_impl/conflict_util.h"

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

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

namespace syncer {