| OLD | NEW |
| 1 // Copyright (c) 2011 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_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ | 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ |
| 6 #define CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ | 6 #define CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 namespace sessions { | 28 namespace sessions { |
| 29 class ConflictProgress; | 29 class ConflictProgress; |
| 30 class StatusController; | 30 class StatusController; |
| 31 } | 31 } |
| 32 | 32 |
| 33 class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand { | 33 class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand { |
| 34 public: | 34 public: |
| 35 BuildAndProcessConflictSetsCommand(); | 35 BuildAndProcessConflictSetsCommand(); |
| 36 virtual ~BuildAndProcessConflictSetsCommand(); | 36 virtual ~BuildAndProcessConflictSetsCommand(); |
| 37 | 37 |
| 38 protected: | |
| 39 // ModelChangingSyncerCommand implementation. | 38 // ModelChangingSyncerCommand implementation. |
| 40 virtual std::set<ModelSafeGroup> GetGroupsToChange( | |
| 41 const sessions::SyncSession& session) const OVERRIDE; | |
| 42 virtual void ModelChangingExecuteImpl( | 39 virtual void ModelChangingExecuteImpl( |
| 43 sessions::SyncSession* session) OVERRIDE; | 40 sessions::SyncSession* session) OVERRIDE; |
| 44 | 41 |
| 45 private: | 42 private: |
| 46 bool BuildAndProcessConflictSets(sessions::SyncSession* session); | 43 bool BuildAndProcessConflictSets(sessions::SyncSession* session); |
| 47 | 44 |
| 48 bool ProcessSingleDirectionConflictSets( | 45 bool ProcessSingleDirectionConflictSets( |
| 49 syncable::WriteTransaction* trans, ConflictResolver* resolver, | 46 syncable::WriteTransaction* trans, ConflictResolver* resolver, |
| 50 Cryptographer* cryptographer, sessions::StatusController* status, | 47 Cryptographer* cryptographer, sessions::StatusController* status, |
| 51 const ModelSafeRoutingInfo& routes); | 48 const ModelSafeRoutingInfo& routes); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 71 void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans, | 68 void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans, |
| 72 syncable::Entry* entry, | 69 syncable::Entry* entry, |
| 73 sessions::ConflictProgress* conflict_progress); | 70 sessions::ConflictProgress* conflict_progress); |
| 74 | 71 |
| 75 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand); | 72 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand); |
| 76 }; | 73 }; |
| 77 | 74 |
| 78 } // namespace browser_sync | 75 } // namespace browser_sync |
| 79 | 76 |
| 80 #endif // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ | 77 #endif // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ |
| OLD | NEW |