| 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/location.h" | 10 #include "base/location.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 // we leave the BASE_VERSION field alone; it'll get updated the first time | 141 // we leave the BASE_VERSION field alone; it'll get updated the first time |
| 142 // we successfully apply this update. | 142 // we successfully apply this update. |
| 143 target_entry.Put(syncable::BASE_VERSION, update.version()); | 143 target_entry.Put(syncable::BASE_VERSION, update.version()); |
| 144 } | 144 } |
| 145 // Force application of this update, no matter what. | 145 // Force application of this update, no matter what. |
| 146 target_entry.Put(syncable::IS_UNAPPLIED_UPDATE, true); | 146 target_entry.Put(syncable::IS_UNAPPLIED_UPDATE, true); |
| 147 } | 147 } |
| 148 | 148 |
| 149 SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name); | 149 SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name); |
| 150 | 150 |
| 151 if (target_entry.Get(syncable::SERVER_VERSION) == | |
| 152 target_entry.Get(syncable::BASE_VERSION) && | |
| 153 !target_entry.Get(syncable::IS_UNSYNCED) && | |
| 154 !target_entry.Get(syncable::IS_UNAPPLIED_UPDATE)) { | |
| 155 // If these don't match, it means that we have a different view of the | |
| 156 // truth from other clients. That's a sync bug, though we may be able | |
| 157 // to recover the next time this item commits. | |
| 158 LOG_IF(ERROR, !SyncerUtil::ServerAndLocalEntriesMatch(&target_entry)) | |
| 159 << target_entry; | |
| 160 } | |
| 161 return SUCCESS_PROCESSED; | 151 return SUCCESS_PROCESSED; |
| 162 } | 152 } |
| 163 | 153 |
| 164 } // namespace browser_sync | 154 } // namespace browser_sync |
| OLD | NEW |