Initial commit of sync engine code to browser/sync....

chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
===================================================================
--- chrome/browser/sync/engine/build_and_process_conflict_sets_command.h	(revision 0)
+++ chrome/browser/sync/engine/build_and_process_conflict_sets_command.h	(revision 0)
@@ -0,0 +1,64 @@
+// Copyright (c) 2006-2009 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 CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_
+#define CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_
+
+#include <vector>
+
+#include "base/basictypes.h"
+#include "chrome/browser/sync/engine/model_changing_syncer_command.h"
+
+namespace syncable {
+class BaseTransaction;
+class Entry;
+class Id;
+class MutableEntry;
+class WriteTransaction;
+}  // namespace syncable
+
+namespace browser_sync {
+
+class ConflictResolutionView;
+class SyncerSession;
+
+class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand {
+ public:
+  BuildAndProcessConflictSetsCommand();
+  virtual ~BuildAndProcessConflictSetsCommand();
+
+  virtual void ModelChangingExecuteImpl(SyncerSession *session);
+
+ private:
+  bool BuildAndProcessConflictSets(SyncerSession *session);
+
+  bool ProcessSingleDirectionConflictSets(
+      syncable::WriteTransaction* trans, SyncerSession* const session);
+  bool ApplyUpdatesTransactionally(
+      syncable::WriteTransaction* trans,
+      const std::vector<syncable::Id>* const update_set,
+      SyncerSession* const session);
+  void BuildAndProcessConflictSetsCommand::BuildConflictSets(
+      syncable::BaseTransaction* trans,
+      ConflictResolutionView* view);
+
+  void MergeSetsForNameClash(syncable::BaseTransaction* trans,
+                             syncable::Entry* entry,
+                             ConflictResolutionView* view);
+  void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans,
+                                   syncable::Entry* entry,
+                                   ConflictResolutionView* view);
+  void MergeSetsForNonEmptyDirectories(syncable::BaseTransaction* trans,
+                                       syncable::Entry* entry,
+                                       ConflictResolutionView* view);
+  void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans,
+                                  syncable::Entry* entry,
+                                  ConflictResolutionView* view);
+
+  DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand);
+};
+
+}  // namespace browser_sync
+
+#endif  // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_
Property changes on: chrome\browser\sync\engine\build_and_process_conflict_sets_command.h
___________________________________________________________________
Added: svn:eol-style
   + LF