| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ | 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
| 6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ | 6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" | 10 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" |
| 11 | 11 |
| 12 namespace syncable { | |
| 13 class WriteTransaction; | |
| 14 class MutableEntry; | |
| 15 class Id; | |
| 16 } | |
| 17 | |
| 18 namespace browser_sync { | 12 namespace browser_sync { |
| 19 | 13 |
| 20 class ResolveConflictsCommand : public ModelChangingSyncerCommand { | 14 class ResolveConflictsCommand : public ModelChangingSyncerCommand { |
| 21 public: | 15 public: |
| 22 ResolveConflictsCommand(); | 16 ResolveConflictsCommand(); |
| 23 virtual ~ResolveConflictsCommand(); | 17 virtual ~ResolveConflictsCommand(); |
| 24 | 18 |
| 25 // ModelChangingSyncerCommand implementation. | 19 // ModelChangingSyncerCommand implementation. |
| 26 virtual void ModelChangingExecuteImpl(sessions::SyncSession* session); | 20 virtual void ModelChangingExecuteImpl(sessions::SyncSession* session); |
| 27 | 21 |
| 28 private: | 22 private: |
| 29 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); | 23 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); |
| 30 }; | 24 }; |
| 31 | 25 |
| 32 } // namespace browser_sync | 26 } // namespace browser_sync |
| 33 | 27 |
| 34 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ | 28 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
| OLD | NEW |