| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #ifndef SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H | 5 #ifndef SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H |
| 6 #define SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H | 6 #define SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "sync/base/sync_export.h" | 9 #include "sync/base/sync_export.h" |
| 10 #include "sync/internal_api/public/base/model_type.h" | 10 #include "sync/internal_api/public/base/model_type.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 int num_successful_commits; | 28 int num_successful_commits; |
| 29 | 29 |
| 30 // This is needed for monitoring extensions activity. | 30 // This is needed for monitoring extensions activity. |
| 31 int num_successful_bookmark_commits; | 31 int num_successful_bookmark_commits; |
| 32 | 32 |
| 33 // Download event counters. | 33 // Download event counters. |
| 34 int num_updates_downloaded_total; | 34 int num_updates_downloaded_total; |
| 35 int num_tombstone_updates_downloaded_total; | 35 int num_tombstone_updates_downloaded_total; |
| 36 int num_reflected_updates_downloaded_total; | 36 int num_reflected_updates_downloaded_total; |
| 37 | 37 |
| 38 // If the syncer encountered a MIGRATION_DONE code, these are the types that | |
| 39 // the client must now "migrate", by purging and re-downloading all updates. | |
| 40 ModelTypeSet types_needing_local_migration; | |
| 41 | |
| 42 // Update application and conflicts. | 38 // Update application and conflicts. |
| 43 int num_updates_applied; | 39 int num_updates_applied; |
| 44 int num_encryption_conflicts; | 40 int num_encryption_conflicts; |
| 45 int num_server_conflicts; | 41 int num_server_conflicts; |
| 46 int num_hierarchy_conflicts; | 42 int num_hierarchy_conflicts; |
| 47 | 43 |
| 48 // Overwrites due to conflict resolution counters. | 44 // Overwrites due to conflict resolution counters. |
| 49 int num_local_overwrites; | 45 int num_local_overwrites; |
| 50 int num_server_overwrites; | 46 int num_server_overwrites; |
| 51 | 47 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 63 // really is nothing more to download. | 59 // really is nothing more to download. |
| 64 int64 num_server_changes_remaining; | 60 int64 num_server_changes_remaining; |
| 65 }; | 61 }; |
| 66 | 62 |
| 67 bool HasSyncerError(const ModelNeutralState& state); | 63 bool HasSyncerError(const ModelNeutralState& state); |
| 68 | 64 |
| 69 } // namespace sessions | 65 } // namespace sessions |
| 70 } // namespace syncer | 66 } // namespace syncer |
| 71 | 67 |
| 72 #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ | 68 #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ |
| OLD | NEW |