| 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/process_updates_command.h" | 5 #include "chrome/browser/sync/engine/process_updates_command.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/tracked.h" | 10 #include "base/tracked.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 break; | 60 break; |
| 61 default: | 61 default: |
| 62 NOTREACHED(); | 62 NOTREACHED(); |
| 63 break; | 63 break; |
| 64 } | 64 } |
| 65 } | 65 } |
| 66 | 66 |
| 67 status->set_num_consecutive_errors(0); | 67 status->set_num_consecutive_errors(0); |
| 68 | 68 |
| 69 status->mutable_update_progress()->ClearVerifiedUpdates(); | 69 status->mutable_update_progress()->ClearVerifiedUpdates(); |
| 70 | |
| 71 // TODO(nick): The following line makes no sense to me. | |
| 72 status->set_syncing(true); | |
| 73 return; | 70 return; |
| 74 } | 71 } |
| 75 | 72 |
| 76 namespace { | 73 namespace { |
| 77 // Returns true if the entry is still ok to process. | 74 // Returns true if the entry is still ok to process. |
| 78 bool ReverifyEntry(syncable::WriteTransaction* trans, const SyncEntity& entry, | 75 bool ReverifyEntry(syncable::WriteTransaction* trans, const SyncEntity& entry, |
| 79 syncable::MutableEntry* same_id) { | 76 syncable::MutableEntry* same_id) { |
| 80 | 77 |
| 81 const bool deleted = entry.has_deleted() && entry.deleted(); | 78 const bool deleted = entry.has_deleted() && entry.deleted(); |
| 82 const bool is_directory = entry.IsFolder(); | 79 const bool is_directory = entry.IsFolder(); |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 // If these don't match, it means that we have a different view of the | 155 // If these don't match, it means that we have a different view of the |
| 159 // truth from other clients. That's a sync bug, though we may be able | 156 // truth from other clients. That's a sync bug, though we may be able |
| 160 // to recover the next time this item commits. | 157 // to recover the next time this item commits. |
| 161 LOG_IF(ERROR, !SyncerUtil::ServerAndLocalEntriesMatch(&target_entry)) | 158 LOG_IF(ERROR, !SyncerUtil::ServerAndLocalEntriesMatch(&target_entry)) |
| 162 << target_entry; | 159 << target_entry; |
| 163 } | 160 } |
| 164 return SUCCESS_PROCESSED; | 161 return SUCCESS_PROCESSED; |
| 165 } | 162 } |
| 166 | 163 |
| 167 } // namespace browser_sync | 164 } // namespace browser_sync |
| OLD | NEW |