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 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" | 5 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <sstream> | 9 #include <sstream> |
10 #include <vector> | 10 #include <vector> |
(...skipping 12 matching lines...) Expand all Loading... |
23 using sessions::StatusController; | 23 using sessions::StatusController; |
24 using sessions::SyncSession; | 24 using sessions::SyncSession; |
25 using sessions::UpdateProgress; | 25 using sessions::UpdateProgress; |
26 using std::set; | 26 using std::set; |
27 using std::string; | 27 using std::string; |
28 using std::vector; | 28 using std::vector; |
29 | 29 |
30 BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {} | 30 BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {} |
31 BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {} | 31 BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {} |
32 | 32 |
33 bool BuildAndProcessConflictSetsCommand::HasCustomGroupsToChange() const { | |
34 return true; | |
35 } | |
36 | |
37 std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange( | 33 std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange( |
38 const sessions::SyncSession& session) const { | 34 const sessions::SyncSession& session) const { |
39 return session.GetEnabledGroupsWithConflicts(); | 35 return session.GetEnabledGroupsWithConflicts(); |
40 } | 36 } |
41 | 37 |
42 void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl( | 38 void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl( |
43 SyncSession* session) { | 39 SyncSession* session) { |
44 session->mutable_status_controller()->update_conflict_sets_built( | 40 session->mutable_status_controller()->update_conflict_sets_built( |
45 BuildAndProcessConflictSets(session)); | 41 BuildAndProcessConflictSets(session)); |
46 } | 42 } |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 LocallyDeletedPathChecker checker; | 410 LocallyDeletedPathChecker checker; |
415 if (!checker.CausingConflict(parent, *entry)) | 411 if (!checker.CausingConflict(parent, *entry)) |
416 return; | 412 return; |
417 conflict_progress->MergeSets(entry->Get(syncable::ID), | 413 conflict_progress->MergeSets(entry->Get(syncable::ID), |
418 parent.Get(syncable::ID)); | 414 parent.Get(syncable::ID)); |
419 CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker); | 415 CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker); |
420 } | 416 } |
421 } | 417 } |
422 | 418 |
423 } // namespace browser_sync | 419 } // namespace browser_sync |
OLD | NEW |