sync/engine/resolve_conflicts_command.cc - Issue 9699057: [Sync] Move 'sync' target to 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: sync/engine/resolve_conflicts_command.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments Created 8 years, 9 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: sync/engine/resolve_conflicts_command.cc

diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.cc b/sync/engine/resolve_conflicts_command.cc

similarity index 81%

rename from chrome/browser/sync/engine/resolve_conflicts_command.cc

rename to sync/engine/resolve_conflicts_command.cc

index 87b031879c077d463cce21de0f6b26f1d6d10d79..457e4b72c164b61ca18573d0679c15be57c72ba8 100644

--- a/chrome/browser/sync/engine/resolve_conflicts_command.cc

+++ b/sync/engine/resolve_conflicts_command.cc

@@ -2,12 +2,12 @@

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

// found in the LICENSE file.

-#include "chrome/browser/sync/engine/resolve_conflicts_command.h"

+#include "sync/engine/resolve_conflicts_command.h"

-#include "chrome/browser/sync/engine/conflict_resolver.h"

-#include "chrome/browser/sync/sessions/session_state.h"

-#include "chrome/browser/sync/sessions/sync_session.h"

-#include "chrome/browser/sync/syncable/syncable.h"

+#include "sync/engine/conflict_resolver.h"

+#include "sync/sessions/session_state.h"

+#include "sync/sessions/sync_session.h"

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

namespace browser_sync {