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

Unified Diff: components/sync/api/conflict_resolution.h

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/api/attachments/attachment_unittest.cc ('k') | components/sync/api/conflict_resolution.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/api/conflict_resolution.h
diff --git a/sync/api/conflict_resolution.h b/components/sync/api/conflict_resolution.h
similarity index 88%
rename from sync/api/conflict_resolution.h
rename to components/sync/api/conflict_resolution.h
index 3a9bb32cd81d72b809571b5f21e568ebf7756d7f..592fb5441d9ef33832473f94289fde85501edd9c 100644
--- a/sync/api/conflict_resolution.h
+++ b/components/sync/api/conflict_resolution.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SYNC_API_CONFLICT_RESOLUTION_H_
-#define SYNC_API_CONFLICT_RESOLUTION_H_
+#ifndef COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
+#define COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
#include <memory>
-#include "sync/api/entity_data.h"
+#include "components/sync/api/entity_data.h"
namespace syncer_v2 {
@@ -54,4 +54,4 @@ class SYNC_EXPORT ConflictResolution {
} // namespace syncer_v2
-#endif // SYNC_API_CONFLICT_RESOLUTION_H_
+#endif // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
« no previous file with comments | « components/sync/api/attachments/attachment_unittest.cc ('k') | components/sync/api/conflict_resolution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698