| 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/build_and_process_conflict_sets_command.h" | 5 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/format_macros.h" | 12 #include "base/format_macros.h" |
| 13 #include "base/rand_util.h" | |
| 14 #include "chrome/browser/sync/engine/syncer_util.h" | 13 #include "chrome/browser/sync/engine/syncer_util.h" |
| 15 #include "chrome/browser/sync/engine/update_applicator.h" | 14 #include "chrome/browser/sync/engine/update_applicator.h" |
| 16 #include "chrome/browser/sync/sessions/sync_session.h" | 15 #include "chrome/browser/sync/sessions/sync_session.h" |
| 17 #include "chrome/browser/sync/syncable/directory_manager.h" | 16 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 18 | 17 |
| 19 namespace browser_sync { | 18 namespace browser_sync { |
| 20 | 19 |
| 21 using sessions::ConflictProgress; | 20 using sessions::ConflictProgress; |
| 22 using sessions::StatusController; | 21 using sessions::StatusController; |
| 23 using sessions::SyncSession; | 22 using sessions::SyncSession; |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 LocallyDeletedPathChecker checker; | 398 LocallyDeletedPathChecker checker; |
| 400 if (!checker.CausingConflict(parent, *entry)) | 399 if (!checker.CausingConflict(parent, *entry)) |
| 401 return; | 400 return; |
| 402 conflict_progress->MergeSets(entry->Get(syncable::ID), | 401 conflict_progress->MergeSets(entry->Get(syncable::ID), |
| 403 parent.Get(syncable::ID)); | 402 parent.Get(syncable::ID)); |
| 404 CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker); | 403 CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker); |
| 405 } | 404 } |
| 406 } | 405 } |
| 407 | 406 |
| 408 } // namespace browser_sync | 407 } // namespace browser_sync |
| OLD | NEW |