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_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 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "chrome/browser/sync/engine/syncer_proto_util.h" | 13 #include "chrome/browser/sync/engine/syncer_proto_util.h" |
14 #include "chrome/browser/sync/engine/syncer_util.h" | 14 #include "chrome/browser/sync/engine/syncer_util.h" |
15 #include "chrome/browser/sync/engine/syncproto.h" | 15 #include "chrome/browser/sync/engine/syncproto.h" |
16 #include "chrome/browser/sync/sessions/sync_session.h" | 16 #include "chrome/browser/sync/sessions/sync_session.h" |
17 #include "chrome/browser/sync/syncable/directory_manager.h" | 17 #include "chrome/browser/sync/syncable/directory_manager.h" |
18 #include "chrome/browser/sync/syncable/syncable.h" | 18 #include "chrome/browser/sync/syncable/syncable.h" |
| 19 #include "chrome/browser/sync/util/time.h" |
19 | 20 |
20 using syncable::ScopedDirLookup; | 21 using syncable::ScopedDirLookup; |
21 using syncable::WriteTransaction; | 22 using syncable::WriteTransaction; |
22 using syncable::MutableEntry; | 23 using syncable::MutableEntry; |
23 using syncable::Entry; | 24 using syncable::Entry; |
24 | 25 |
25 using std::set; | 26 using std::set; |
26 using std::string; | 27 using std::string; |
27 using std::vector; | 28 using std::vector; |
28 | 29 |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 // Don't clobber any other fields of deleted objects. | 374 // Don't clobber any other fields of deleted objects. |
374 return; | 375 return; |
375 } | 376 } |
376 | 377 |
377 local_entry->Put(syncable::SERVER_IS_DIR, | 378 local_entry->Put(syncable::SERVER_IS_DIR, |
378 (committed_entry.folder() || | 379 (committed_entry.folder() || |
379 committed_entry.bookmarkdata().bookmark_folder())); | 380 committed_entry.bookmarkdata().bookmark_folder())); |
380 local_entry->Put(syncable::SERVER_SPECIFICS, | 381 local_entry->Put(syncable::SERVER_SPECIFICS, |
381 committed_entry.specifics()); | 382 committed_entry.specifics()); |
382 local_entry->Put(syncable::SERVER_MTIME, | 383 local_entry->Put(syncable::SERVER_MTIME, |
383 committed_entry.mtime()); | 384 ProtoTimeToTime(committed_entry.mtime())); |
384 local_entry->Put(syncable::SERVER_CTIME, | 385 local_entry->Put(syncable::SERVER_CTIME, |
385 committed_entry.ctime()); | 386 ProtoTimeToTime(committed_entry.ctime())); |
386 local_entry->Put(syncable::SERVER_POSITION_IN_PARENT, | 387 local_entry->Put(syncable::SERVER_POSITION_IN_PARENT, |
387 entry_response.position_in_parent()); | 388 entry_response.position_in_parent()); |
388 // TODO(nick): The server doesn't set entry_response.server_parent_id in | 389 // TODO(nick): The server doesn't set entry_response.server_parent_id in |
389 // practice; to update SERVER_PARENT_ID appropriately here we'd need to | 390 // practice; to update SERVER_PARENT_ID appropriately here we'd need to |
390 // get the post-commit ID of the parent indicated by | 391 // get the post-commit ID of the parent indicated by |
391 // committed_entry.parent_id_string(). That should be inferrable from the | 392 // committed_entry.parent_id_string(). That should be inferrable from the |
392 // information we have, but it's a bit convoluted to pull it out directly. | 393 // information we have, but it's a bit convoluted to pull it out directly. |
393 // Getting this right is important: SERVER_PARENT_ID gets fed back into | 394 // Getting this right is important: SERVER_PARENT_ID gets fed back into |
394 // old_parent_id during the next commit. | 395 // old_parent_id during the next commit. |
395 local_entry->Put(syncable::SERVER_PARENT_ID, | 396 local_entry->Put(syncable::SERVER_PARENT_ID, |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 // been recursively deleted. | 483 // been recursively deleted. |
483 // TODO(nick): Here, commit_message.deleted() would be more correct than | 484 // TODO(nick): Here, commit_message.deleted() would be more correct than |
484 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then | 485 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then |
485 // deleted during the commit of the rename. Unit test & fix. | 486 // deleted during the commit of the rename. Unit test & fix. |
486 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { | 487 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { |
487 deleted_folders->insert(local_entry->Get(ID)); | 488 deleted_folders->insert(local_entry->Get(ID)); |
488 } | 489 } |
489 } | 490 } |
490 | 491 |
491 } // namespace browser_sync | 492 } // namespace browser_sync |
OLD | NEW |