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

Unified Diff: components/sync/engine_impl/syncer_util.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/engine_impl/syncer_unittest.cc ('k') | components/sync/engine_impl/syncer_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/engine_impl/syncer_util.h
diff --git a/sync/engine/syncer_util.h b/components/sync/engine_impl/syncer_util.h
similarity index 79%
rename from sync/engine/syncer_util.h
rename to components/sync/engine_impl/syncer_util.h
index f915ba7653a1c029a92b9ba59bb409427405812a..5c4d10ca20562fdb431d23c10f5fa12a35e0b7f0 100644
--- a/sync/engine/syncer_util.h
+++ b/components/sync/engine_impl/syncer_util.h
@@ -5,8 +5,8 @@
// Utility functions manipulating syncable::Entries, intended for use by the
// syncer.
-#ifndef SYNC_ENGINE_SYNCER_UTIL_H_
-#define SYNC_ENGINE_SYNCER_UTIL_H_
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_UTIL_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_UTIL_H_
#include <stdint.h>
@@ -14,13 +14,13 @@
#include <string>
#include <vector>
-#include "sync/base/sync_export.h"
-#include "sync/engine/syncer.h"
-#include "sync/engine/syncer_types.h"
-#include "sync/syncable/entry_kernel.h"
-#include "sync/syncable/metahandle_set.h"
-#include "sync/syncable/mutable_entry.h"
-#include "sync/syncable/syncable_id.h"
+#include "components/sync/base/sync_export.h"
+#include "components/sync/engine_impl/syncer.h"
+#include "components/sync/engine_impl/syncer_types.h"
+#include "components/sync/syncable/entry_kernel.h"
+#include "components/sync/syncable/metahandle_set.h"
+#include "components/sync/syncable/mutable_entry.h"
+#include "components/sync/syncable/syncable_id.h"
namespace sync_pb {
class SyncEntity;
@@ -44,9 +44,8 @@ class Cryptographer;
// should proceed normally with a new local entry, this function will
// return server_entry.id(); the caller must create an entry with that
// ID. This function does not alter the database.
-syncable::Id FindLocalIdToUpdate(
- syncable::BaseTransaction* trans,
- const sync_pb::SyncEntity& server_entry);
+syncable::Id FindLocalIdToUpdate(syncable::BaseTransaction* trans,
+ const sync_pb::SyncEntity& server_entry);
UpdateAttemptResponse AttemptToUpdateEntry(
syncable::WriteTransaction* const trans,
@@ -76,7 +75,7 @@ SYNC_EXPORT void UpdateServerFieldsFromUpdate(
const std::string& name);
// Creates a new Entry iff no Entry exists with the given id.
-void CreateNewEntry(syncable::ModelNeutralWriteTransaction *trans,
+void CreateNewEntry(syncable::ModelNeutralWriteTransaction* trans,
const syncable::Id& id);
// This function is called on an entry when we can update the user-facing data
@@ -106,11 +105,10 @@ VerifyResult VerifyUndelete(syncable::ModelNeutralWriteTransaction* trans,
const sync_pb::SyncEntity& update,
syncable::ModelNeutralMutableEntry* target);
-void MarkDeletedChildrenSynced(
- syncable::Directory* dir,
- syncable::BaseWriteTransaction* trans,
- std::set<syncable::Id>* deleted_folders);
+void MarkDeletedChildrenSynced(syncable::Directory* dir,
+ syncable::BaseWriteTransaction* trans,
+ std::set<syncable::Id>* deleted_folders);
} // namespace syncer
-#endif // SYNC_ENGINE_SYNCER_UTIL_H_
+#endif // COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_UTIL_H_
« no previous file with comments | « components/sync/engine_impl/syncer_unittest.cc ('k') | components/sync/engine_impl/syncer_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698