| 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 SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 5 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| 6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 Status(); | 95 Status(); |
| 96 ~Status(); | 96 ~Status(); |
| 97 | 97 |
| 98 bool notifications_enabled; // True only if subscribed for notifications. | 98 bool notifications_enabled; // True only if subscribed for notifications. |
| 99 | 99 |
| 100 // Notifications counters updated by the actions in synapi. | 100 // Notifications counters updated by the actions in synapi. |
| 101 int notifications_received; | 101 int notifications_received; |
| 102 | 102 |
| 103 browser_sync::SyncProtocolError sync_protocol_error; | 103 browser_sync::SyncProtocolError sync_protocol_error; |
| 104 | 104 |
| 105 // Number of unsynced items counted at the start of most recent sync cycle. | |
| 106 int unsynced_count; | |
| 107 | |
| 108 // Number of encryption conflicts counted during most recent sync cycle. | 105 // Number of encryption conflicts counted during most recent sync cycle. |
| 109 int encryption_conflicts; | 106 int encryption_conflicts; |
| 110 | 107 |
| 111 // Number of hierarchy conflicts counted during most recent sync cycle. | 108 // Number of hierarchy conflicts counted during most recent sync cycle. |
| 112 int hierarchy_conflicts; | 109 int hierarchy_conflicts; |
| 113 | 110 |
| 114 // Number of simple conflicts counted during most recent sync cycle. | 111 // Number of simple conflicts counted during most recent sync cycle. |
| 115 int simple_conflicts; | 112 int simple_conflicts; |
| 116 | 113 |
| 117 // Number of items the server refused to commit due to conflict during most | 114 // Number of items the server refused to commit due to conflict during most |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 sync_api::UserShare* share); | 633 sync_api::UserShare* share); |
| 637 | 634 |
| 638 const char* ConnectionStatusToString(ConnectionStatus status); | 635 const char* ConnectionStatusToString(ConnectionStatus status); |
| 639 | 636 |
| 640 // Returns the string representation of a PassphraseRequiredReason value. | 637 // Returns the string representation of a PassphraseRequiredReason value. |
| 641 const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason); | 638 const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason); |
| 642 | 639 |
| 643 } // namespace sync_api | 640 } // namespace sync_api |
| 644 | 641 |
| 645 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 642 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| OLD | NEW |