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

Unified Diff: components/sync/engine_impl/update_applicator.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/traffic_logger.cc ('k') | components/sync/engine_impl/update_applicator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/engine_impl/update_applicator.h
diff --git a/sync/engine/update_applicator.h b/components/sync/engine_impl/update_applicator.h
similarity index 74%
rename from sync/engine/update_applicator.h
rename to components/sync/engine_impl/update_applicator.h
index 4cb885afee6eb49bd7ed32c22e9b1749e3ed5b04..e4afa3619459062712584f3a1034d7b95374713f 100644
--- a/sync/engine/update_applicator.h
+++ b/components/sync/engine_impl/update_applicator.h
@@ -8,8 +8,8 @@
// UpdateApplicator might resemble an iterator, but it actually keeps retrying
// failed updates until no remaining updates can be successfully applied.
-#ifndef SYNC_ENGINE_UPDATE_APPLICATOR_H_
-#define SYNC_ENGINE_UPDATE_APPLICATOR_H_
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_UPDATE_APPLICATOR_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_UPDATE_APPLICATOR_H_
#include <stdint.h>
@@ -17,9 +17,9 @@
#include <vector>
#include "base/macros.h"
-#include "sync/internal_api/public/engine/model_safe_worker.h"
-#include "sync/sessions/status_controller.h"
-#include "sync/syncable/syncable_id.h"
+#include "components/sync/engine/model_safe_worker.h"
+#include "components/sync/sessions_impl/status_controller.h"
+#include "components/sync/syncable/syncable_id.h"
namespace syncer {
@@ -44,17 +44,11 @@ class UpdateApplicator {
void AttemptApplications(syncable::WriteTransaction* trans,
const std::vector<int64_t>& handles);
- int updates_applied() {
- return updates_applied_;
- }
+ int updates_applied() { return updates_applied_; }
- int encryption_conflicts() {
- return encryption_conflicts_;
- }
+ int encryption_conflicts() { return encryption_conflicts_; }
- int hierarchy_conflicts() {
- return hierarchy_conflicts_;
- }
+ int hierarchy_conflicts() { return hierarchy_conflicts_; }
const std::set<syncable::Id>& simple_conflict_ids() {
return simple_conflict_ids_;
@@ -77,4 +71,4 @@ class UpdateApplicator {
} // namespace syncer
-#endif // SYNC_ENGINE_UPDATE_APPLICATOR_H_
+#endif // COMPONENTS_SYNC_ENGINE_IMPL_UPDATE_APPLICATOR_H_
« no previous file with comments | « components/sync/engine_impl/traffic_logger.cc ('k') | components/sync/engine_impl/update_applicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698