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

Unified Diff: components/sync/engine_impl/cycle/nudge_tracker.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: 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
Index: components/sync/engine_impl/cycle/nudge_tracker.h
diff --git a/components/sync/engine_impl/cycle/nudge_tracker.h b/components/sync/engine_impl/cycle/nudge_tracker.h
index 7d9ccc4605b7ae649a4c7855eb46cae67ad778bb..ef48b935e3edc0a8efae6c0d56ead9b0dc2955e9 100644
--- a/components/sync/engine_impl/cycle/nudge_tracker.h
+++ b/components/sync/engine_impl/cycle/nudge_tracker.h
@@ -64,15 +64,15 @@ class NudgeTracker {
// Takes note of the receipt of an invalidation notice from the server.
// Returns the current nudge delay for a remote invalidation.
base::TimeDelta RecordRemoteInvalidation(
- ModelType type,
+ syncer::ModelType type,
std::unique_ptr<InvalidationInterface> invalidation);
// Take note that an initial sync is pending for this type.
- void RecordInitialSyncRequired(ModelType type);
+ void RecordInitialSyncRequired(syncer::ModelType type);
// Takes note that the conflict happended for this type, need to sync to
// resolve conflict locally.
- void RecordCommitConflict(ModelType type);
+ void RecordCommitConflict(syncer::ModelType type);
// These functions should be called to keep this class informed of the status
// of the connection to the invalidations server.

Powered by Google App Engine
This is Rietveld 408576698