diff options
Diffstat (limited to 'chrome/browser/sync/sessions/sync_session.cc')
| -rw-r--r-- | chrome/browser/sync/sessions/sync_session.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/sessions/sync_session.cc b/chrome/browser/sync/sessions/sync_session.cc index a3bf6f1..ff07ee27 100644 --- a/chrome/browser/sync/sessions/sync_session.cc +++ b/chrome/browser/sync/sessions/sync_session.cc @@ -159,8 +159,10 @@ SyncSessionSnapshot SyncSession::TakeSnapshot() const { HasMoreToSync(), delegate_->IsSyncingCurrentlySilenced(), status_controller_->unsynced_handles().size(), + status_controller_->TotalNumEncryptionConflictingItems(), + status_controller_->TotalNumHierarchyConflictingItems(), status_controller_->TotalNumSimpleConflictingItems(), - status_controller_->TotalNumConflictingItems(), + status_controller_->TotalNumServerConflictingItems(), status_controller_->did_commit_items(), source_, dir->GetEntriesCount(), |