Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Fix some minor diffs 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:
View side-by-side diff with in-line comments
Download patch
« sync/DEPS ('K') | « sync/engine/resolve_conflicts_command.h ('k') | sync/engine/resolve_conflicts_command_unittest.cc » ('j') | sync/protocol/proto_value_conversions.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« sync/DEPS ('K') | « sync/engine/resolve_conflicts_command.h ('k') | sync/engine/resolve_conflicts_command_unittest.cc » ('j') | sync/protocol/proto_value_conversions.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698