| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "sync/engine/process_commit_response_command.h" | 5 #include "sync/engine/process_commit_response_command.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 ++error_commits; | 128 ++error_commits; |
| 129 break; | 129 break; |
| 130 case CommitResponse::CONFLICT: | 130 case CommitResponse::CONFLICT: |
| 131 ++conflicting_commits; | 131 ++conflicting_commits; |
| 132 conflict_progress->AddServerConflictingItemById( | 132 conflict_progress->AddServerConflictingItemById( |
| 133 commit_set_.GetCommitIdAt(proj[i])); | 133 commit_set_.GetCommitIdAt(proj[i])); |
| 134 break; | 134 break; |
| 135 case CommitResponse::SUCCESS: | 135 case CommitResponse::SUCCESS: |
| 136 // TODO(sync): worry about sync_rate_ rate calc? | 136 // TODO(sync): worry about sync_rate_ rate calc? |
| 137 ++successes; | 137 ++successes; |
| 138 if (commit_set_.GetModelTypeAt(proj[i]) == syncer::BOOKMARKS) | 138 if (commit_set_.GetModelTypeAt(proj[i]) == BOOKMARKS) |
| 139 status->increment_num_successful_bookmark_commits(); | 139 status->increment_num_successful_bookmark_commits(); |
| 140 status->increment_num_successful_commits(); | 140 status->increment_num_successful_commits(); |
| 141 break; | 141 break; |
| 142 case CommitResponse::OVER_QUOTA: | 142 case CommitResponse::OVER_QUOTA: |
| 143 // We handle over quota like a retry, which is same as transient. | 143 // We handle over quota like a retry, which is same as transient. |
| 144 case CommitResponse::RETRY: | 144 case CommitResponse::RETRY: |
| 145 case CommitResponse::TRANSIENT_ERROR: | 145 case CommitResponse::TRANSIENT_ERROR: |
| 146 ++transient_error_commits; | 146 ++transient_error_commits; |
| 147 break; | 147 break; |
| 148 default: | 148 default: |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 // been recursively deleted. | 472 // been recursively deleted. |
| 473 // TODO(nick): Here, commit_message.deleted() would be more correct than | 473 // TODO(nick): Here, commit_message.deleted() would be more correct than |
| 474 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then | 474 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then |
| 475 // deleted during the commit of the rename. Unit test & fix. | 475 // deleted during the commit of the rename. Unit test & fix. |
| 476 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { | 476 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { |
| 477 deleted_folders->insert(local_entry->Get(ID)); | 477 deleted_folders->insert(local_entry->Get(ID)); |
| 478 } | 478 } |
| 479 } | 479 } |
| 480 | 480 |
| 481 } // namespace syncer | 481 } // namespace syncer |
| OLD | NEW |