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_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/internal_api/public/util/syncer_error.h" | 9 #include "sync/internal_api/public/util/syncer_error.h" |
10 #include "sync/protocol/sync.pb.h" | 10 #include "sync/protocol/sync.pb.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 // the client must now "migrate", by purging and re-downloading all updates. | 41 // the client must now "migrate", by purging and re-downloading all updates. |
42 syncer::ModelTypeSet types_needing_local_migration; | 42 syncer::ModelTypeSet types_needing_local_migration; |
43 | 43 |
44 // Overwrites due to conflict resolution counters. | 44 // Overwrites due to conflict resolution counters. |
45 int num_local_overwrites; | 45 int num_local_overwrites; |
46 int num_server_overwrites; | 46 int num_server_overwrites; |
47 | 47 |
48 // Any protocol errors that we received during this sync session. | 48 // Any protocol errors that we received during this sync session. |
49 SyncProtocolError sync_protocol_error; | 49 SyncProtocolError sync_protocol_error; |
50 | 50 |
51 // Records the most recent results of PostCommit and GetUpdates commands. | 51 // Records the most recent results of GetKey, PostCommit and GetUpdates |
52 // commands. | |
53 SyncerError last_get_key_result; | |
tim (not reviewing)
2012/07/26 21:53:15
We don't technically have GetKey in this patch any
Nicolas Zea
2012/07/27 00:43:15
For the sake of making it clear where the failure
| |
52 SyncerError last_download_updates_result; | 54 SyncerError last_download_updates_result; |
53 SyncerError commit_result; | 55 SyncerError commit_result; |
54 | 56 |
55 // Set to true by ResolveConflictsCommand if any forward progress was made. | 57 // Set to true by ResolveConflictsCommand if any forward progress was made. |
56 bool conflicts_resolved; | 58 bool conflicts_resolved; |
57 | 59 |
58 // Set to true by PostCommitMessageCommand if any commits were successful. | 60 // Set to true by PostCommitMessageCommand if any commits were successful. |
59 bool items_committed; | 61 bool items_committed; |
60 | 62 |
61 // True indicates debug info has been sent once this session. | 63 // True indicates debug info has been sent once this session. |
62 bool debug_info_sent; | 64 bool debug_info_sent; |
63 | 65 |
64 // Number of changes remaining, according to the server. | 66 // Number of changes remaining, according to the server. |
65 // Take it as an estimate unless it's value is zero, in which case there | 67 // Take it as an estimate unless it's value is zero, in which case there |
66 // really is nothing more to download. | 68 // really is nothing more to download. |
67 int64 num_server_changes_remaining; | 69 int64 num_server_changes_remaining; |
68 }; | 70 }; |
69 | 71 |
70 } // namespace sessions | 72 } // namespace sessions |
71 } // namespace syncer | 73 } // namespace syncer |
72 | 74 |
73 #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ | 75 #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ |
OLD | NEW |