OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 #include "chrome/browser/sync/engine/resolve_conflicts_command.h" | 5 #include "chrome/browser/sync/engine/resolve_conflicts_command.h" |
6 | 6 |
7 #include "chrome/browser/sync/engine/conflict_resolver.h" | 7 #include "chrome/browser/sync/engine/conflict_resolver.h" |
8 #include "chrome/browser/sync/sessions/session_state.h" | 8 #include "chrome/browser/sync/sessions/session_state.h" |
9 #include "chrome/browser/sync/sessions/sync_session.h" | 9 #include "chrome/browser/sync/sessions/sync_session.h" |
10 #include "chrome/browser/sync/syncable/directory_manager.h" | 10 #include "chrome/browser/sync/syncable/directory_manager.h" |
11 | 11 |
12 namespace browser_sync { | 12 namespace browser_sync { |
13 | 13 |
14 ResolveConflictsCommand::ResolveConflictsCommand() {} | 14 ResolveConflictsCommand::ResolveConflictsCommand() {} |
15 ResolveConflictsCommand::~ResolveConflictsCommand() {} | 15 ResolveConflictsCommand::~ResolveConflictsCommand() {} |
16 | 16 |
| 17 std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange( |
| 18 const sessions::SyncSession& session) const { |
| 19 return session.GetEnabledGroupsWithConflicts(); |
| 20 } |
| 21 |
17 void ResolveConflictsCommand::ModelChangingExecuteImpl( | 22 void ResolveConflictsCommand::ModelChangingExecuteImpl( |
18 sessions::SyncSession* session) { | 23 sessions::SyncSession* session) { |
19 ConflictResolver* resolver = session->context()->resolver(); | 24 ConflictResolver* resolver = session->context()->resolver(); |
20 DCHECK(resolver); | 25 DCHECK(resolver); |
21 if (!resolver) | 26 if (!resolver) |
22 return; | 27 return; |
23 | 28 |
24 syncable::ScopedDirLookup dir(session->context()->directory_manager(), | 29 syncable::ScopedDirLookup dir(session->context()->directory_manager(), |
25 session->context()->account_name()); | 30 session->context()->account_name()); |
26 if (!dir.good()) | 31 if (!dir.good()) |
27 return; | 32 return; |
28 sessions::StatusController* status = session->mutable_status_controller(); | 33 sessions::StatusController* status = session->mutable_status_controller(); |
29 const sessions::ConflictProgress* progress = status->conflict_progress(); | 34 const sessions::ConflictProgress* progress = status->conflict_progress(); |
30 if (!progress) | 35 if (!progress) |
31 return; // Nothing to do. | 36 return; // Nothing to do. |
32 status->update_conflicts_resolved( | 37 status->update_conflicts_resolved( |
33 resolver->ResolveConflicts(dir, *progress, status)); | 38 resolver->ResolveConflicts(dir, *progress, status)); |
34 } | 39 } |
35 | 40 |
36 } // namespace browser_sync | 41 } // namespace browser_sync |
OLD | NEW |