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

Unified Diff: sync/engine/syncer_types.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 | « sync/engine/syncer_proto_util_unittest.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_types.h
diff --git a/sync/engine/syncer_types.h b/sync/engine/syncer_types.h
deleted file mode 100644
index 36f3dbcf8dda9ea7ff50a3925202f6f6556402fb..0000000000000000000000000000000000000000
--- a/sync/engine/syncer_types.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SYNC_ENGINE_SYNCER_TYPES_H_
-#define SYNC_ENGINE_SYNCER_TYPES_H_
-
-// The intent of this is to keep all shared data types and enums for the syncer
-// in a single place without having dependencies between other files.
-namespace syncer {
-
-enum UpdateAttemptResponse {
- // Update was applied or safely ignored.
- SUCCESS,
-
- // The conditions described by the following enum values are not mutually
- // exclusive. The list has been ordered according to priority in the case of
- // overlap, with highest priority first.
- //
- // For example, in the case where an item had both the IS_UNSYCNED and
- // IS_UNAPPLIED_UPDATE flags set (CONFLICT_SIMPLE), and a SERVER_PARENT_ID
- // that, if applied, would cause a directory loop (CONFLICT_HIERARCHY), and
- // specifics that we can't decrypt right now (CONFLICT_ENCRYPTION), the
- // UpdateApplicator would return CONFLICT_ENCRYPTION when attempting to
- // process the item.
- //
- // We do not attempt to resolve CONFLICT_HIERARCHY or CONFLICT_ENCRYPTION
- // items. We will leave these updates unapplied and wait for the server
- // to send us newer updates that will resolve the conflict.
-
- // We were unable to decrypt/encrypt this server data. As such, we can't make
- // forward progress on this node, but because the passphrase may not arrive
- // until later we don't want to get the syncer stuck. See UpdateApplicator
- // for how this is handled.
- CONFLICT_ENCRYPTION,
-
- // These are some updates that, if applied, would violate the tree's
- // invariants. Examples of this include the server adding children to locally
- // deleted directories and directory moves that would create loops.
- CONFLICT_HIERARCHY,
-
- // This indicates that item was modified both remotely (IS_UNAPPLIED_UPDATE)
- // and locally (IS_UNSYNCED). We use the ConflictResolver to decide which of
- // the changes should take priority, or if we can possibly merge the data.
- CONFLICT_SIMPLE
-};
-
-// Different results from the verify phase will yield different methods of
-// processing in the ProcessUpdates phase. The SKIP result means the entry
-// doesn't go to the ProcessUpdates phase.
-enum VerifyResult {
- VERIFY_FAIL,
- VERIFY_SUCCESS,
- VERIFY_UNDELETE,
- VERIFY_SKIP,
- VERIFY_UNDECIDED
-};
-
-enum VerifyCommitResult {
- VERIFY_UNSYNCABLE,
- VERIFY_OK,
-};
-
-} // namespace syncer
-
-#endif // SYNC_ENGINE_SYNCER_TYPES_H_
« no previous file with comments | « sync/engine/syncer_proto_util_unittest.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698