| 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_commit_response_command.h" | 5 #include "chrome/browser/sync/engine/process_commit_response_command.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 ResetErrorCounters(status); | 189 ResetErrorCounters(status); |
| 190 } | 190 } |
| 191 SyncerUtil::MarkDeletedChildrenSynced(dir, &deleted_folders); | 191 SyncerUtil::MarkDeletedChildrenSynced(dir, &deleted_folders); |
| 192 status->set_over_quota(over_quota); | 192 status->set_over_quota(over_quota); |
| 193 | 193 |
| 194 return; | 194 return; |
| 195 } | 195 } |
| 196 | 196 |
| 197 void LogServerError(const CommitResponse_EntryResponse& res) { | 197 void LogServerError(const CommitResponse_EntryResponse& res) { |
| 198 if (res.has_error_message()) | 198 if (res.has_error_message()) |
| 199 LOG(ERROR) << " " << res.error_message(); | 199 LOG(WARNING) << " " << res.error_message(); |
| 200 else | 200 else |
| 201 LOG(ERROR) << " No detailed error message returned from server"; | 201 LOG(WARNING) << " No detailed error message returned from server"; |
| 202 } | 202 } |
| 203 | 203 |
| 204 CommitResponse::ResponseType | 204 CommitResponse::ResponseType |
| 205 ProcessCommitResponseCommand::ProcessSingleCommitResponse( | 205 ProcessCommitResponseCommand::ProcessSingleCommitResponse( |
| 206 syncable::WriteTransaction* trans, | 206 syncable::WriteTransaction* trans, |
| 207 const sync_pb::CommitResponse_EntryResponse& pb_server_entry, | 207 const sync_pb::CommitResponse_EntryResponse& pb_server_entry, |
| 208 const syncable::Id& pre_commit_id, | 208 const syncable::Id& pre_commit_id, |
| 209 std::set<syncable::Id>* conflicting_new_folder_ids, | 209 std::set<syncable::Id>* conflicting_new_folder_ids, |
| 210 set<syncable::Id>* deleted_folders) { | 210 set<syncable::Id>* deleted_folders) { |
| 211 | 211 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 | 373 |
| 374 if (!server_name.empty() && old_name != server_name) { | 374 if (!server_name.empty() && old_name != server_name) { |
| 375 LOG(INFO) << "Server commit moved aside entry: " << old_name | 375 LOG(INFO) << "Server commit moved aside entry: " << old_name |
| 376 << " to new name " << server_name; | 376 << " to new name " << server_name; |
| 377 // Should be safe since we're in a "commit lock." | 377 // Should be safe since we're in a "commit lock." |
| 378 local_entry->Put(syncable::NON_UNIQUE_NAME, server_name); | 378 local_entry->Put(syncable::NON_UNIQUE_NAME, server_name); |
| 379 } | 379 } |
| 380 } | 380 } |
| 381 | 381 |
| 382 } // namespace browser_sync | 382 } // namespace browser_sync |
| OLD | NEW |