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

Unified Diff: components/sync/model/conflict_resolution.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/model/conflict_resolution.h ('k') | components/sync/model/data_batch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/model/conflict_resolution.cc
diff --git a/components/sync/api/conflict_resolution.cc b/components/sync/model/conflict_resolution.cc
similarity index 95%
rename from components/sync/api/conflict_resolution.cc
rename to components/sync/model/conflict_resolution.cc
index 83a77c8c215c64845fdf5c0aa9c9ea5ed5aeeb6a..eedeb0dc1f6ba3d58e3626e626ac184ac7657315 100644
--- a/components/sync/api/conflict_resolution.cc
+++ b/components/sync/model/conflict_resolution.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/sync/api/conflict_resolution.h"
+#include "components/sync/model/conflict_resolution.h"
#include <utility>
« no previous file with comments | « components/sync/model/conflict_resolution.h ('k') | components/sync/model/data_batch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698