| 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/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 "chrome/browser/sync/engine/syncer.h" | 10 #include "chrome/browser/sync/engine/syncer.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 if (it->first != VERIFY_SUCCESS && it->first != VERIFY_UNDELETE) | 85 if (it->first != VERIFY_SUCCESS && it->first != VERIFY_UNDELETE) |
| 86 continue; | 86 continue; |
| 87 switch (ProcessUpdate(dir, update)) { | 87 switch (ProcessUpdate(dir, update)) { |
| 88 case SUCCESS_PROCESSED: | 88 case SUCCESS_PROCESSED: |
| 89 case SUCCESS_STORED: | 89 case SUCCESS_STORED: |
| 90 // We can update the timestamp because we store the update even if we | 90 // We can update the timestamp because we store the update even if we |
| 91 // can't apply it now. | 91 // can't apply it now. |
| 92 if (update.sync_timestamp() > new_timestamp) | 92 if (update.sync_timestamp() > new_timestamp) |
| 93 new_timestamp = update.sync_timestamp(); | 93 new_timestamp = update.sync_timestamp(); |
| 94 break; | 94 break; |
| 95 default: |
| 96 NOTREACHED(); |
| 97 break; |
| 95 } | 98 } |
| 96 | 99 |
| 97 } | 100 } |
| 98 | 101 |
| 99 if (latest_skip_timestamp > new_timestamp) | 102 if (latest_skip_timestamp > new_timestamp) |
| 100 new_timestamp = latest_skip_timestamp; | 103 new_timestamp = latest_skip_timestamp; |
| 101 | 104 |
| 102 if (new_timestamp > dir->last_sync_timestamp()) { | 105 if (new_timestamp > dir->last_sync_timestamp()) { |
| 103 dir->set_last_sync_timestamp(new_timestamp); | 106 dir->set_last_sync_timestamp(new_timestamp); |
| 104 session->set_timestamp_dirty(); | 107 session->set_timestamp_dirty(); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 159 |
| 157 if (update_entry.Get(SERVER_VERSION) == update_entry.Get(BASE_VERSION) && | 160 if (update_entry.Get(SERVER_VERSION) == update_entry.Get(BASE_VERSION) && |
| 158 !update_entry.Get(IS_UNSYNCED)) { | 161 !update_entry.Get(IS_UNSYNCED)) { |
| 159 CHECK(SyncerUtil::ServerAndLocalEntriesMatch( | 162 CHECK(SyncerUtil::ServerAndLocalEntriesMatch( |
| 160 &update_entry)) << update_entry; | 163 &update_entry)) << update_entry; |
| 161 } | 164 } |
| 162 return SUCCESS_PROCESSED; | 165 return SUCCESS_PROCESSED; |
| 163 } | 166 } |
| 164 | 167 |
| 165 } // namespace browser_sync | 168 } // namespace browser_sync |
| OLD | NEW |