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

chrome/browser/sync/engine/resolve_conflicts_command.h

Index: chrome/browser/sync/engine/resolve_conflicts_command.h
===================================================================
--- chrome/browser/sync/engine/resolve_conflicts_command.h	(revision 0)
+++ chrome/browser/sync/engine/resolve_conflicts_command.h	(revision 0)
@@ -0,0 +1,34 @@
+// 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_RESOLVE_CONFLICTS_COMMAND_H_
+#define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
+

[idana, 2009/09/10 05:44:37]

Extra blank line.

+
+#include "chrome/browser/sync/engine/model_changing_syncer_command.h"
+#include "base/basictypes.h"
+
+namespace syncable {
+class WriteTransaction;
+class MutableEntry;
+class Id;
+}
+namespace browser_sync {
+
+class SyncerSession;
+
+class ResolveConflictsCommand : public ModelChangingSyncerCommand {
+ public:
+  ResolveConflictsCommand();
+  virtual ~ResolveConflictsCommand();
+
+  virtual void ModelChangingExecuteImpl(SyncerSession* session);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
+};
+}  // namespace browser_sync
+
+
+#endif  // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
Property changes on: chrome\browser\sync\engine\resolve_conflicts_command.h
___________________________________________________________________
Added: svn:eol-style
   + LF