| 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 #ifndef CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 5 #ifndef CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| 6 #define CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 6 #define CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 int committed_count; | 155 int committed_count; |
| 156 | 156 |
| 157 bool syncing; | 157 bool syncing; |
| 158 // True after a client has done a first sync. | 158 // True after a client has done a first sync. |
| 159 bool initial_sync_ended; | 159 bool initial_sync_ended; |
| 160 | 160 |
| 161 // Total updates available. If zero, nothing left to download. | 161 // Total updates available. If zero, nothing left to download. |
| 162 int64 updates_available; | 162 int64 updates_available; |
| 163 // Total updates received by the syncer since browser start. | 163 // Total updates received by the syncer since browser start. |
| 164 int updates_received; | 164 int updates_received; |
| 165 // Total updates received that are echoes of our own changes. |
| 166 int echo_updates_received; |
| 165 | 167 |
| 166 // Of updates_received, how many were tombstones. | 168 // Of updates_received, how many were tombstones. |
| 167 int tombstone_updates_received; | 169 int tombstone_updates_received; |
| 168 | 170 |
| 169 // Total number of overwrites due to conflict resolver since browser start. | 171 // Total number of overwrites due to conflict resolver since browser start. |
| 170 int num_local_overwrites_total; | 172 int num_local_overwrites_total; |
| 171 int num_server_overwrites_total; | 173 int num_server_overwrites_total; |
| 172 | 174 |
| 173 // Count of empty and non empty getupdates; | 175 // Count of empty and non empty getupdates; |
| 174 int nonempty_get_updates; | 176 int nonempty_get_updates; |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 sync_api::UserShare* share); | 669 sync_api::UserShare* share); |
| 668 | 670 |
| 669 const char* ConnectionStatusToString(ConnectionStatus status); | 671 const char* ConnectionStatusToString(ConnectionStatus status); |
| 670 | 672 |
| 671 // Returns the string representation of a PassphraseRequiredReason value. | 673 // Returns the string representation of a PassphraseRequiredReason value. |
| 672 const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason); | 674 const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason); |
| 673 | 675 |
| 674 } // namespace sync_api | 676 } // namespace sync_api |
| 675 | 677 |
| 676 #endif // CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 678 #endif // CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| OLD | NEW |