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/util/syncer_error.h" | 10 #include "sync/internal_api/public/util/syncer_error.h" |
11 #include "sync/protocol/sync.pb.h" | 11 #include "sync/protocol/sync.pb.h" |
12 #include "sync/protocol/sync_protocol_error.h" | 12 #include "sync/protocol/sync_protocol_error.h" |
13 | 13 |
14 namespace syncer { | 14 namespace syncer { |
15 namespace sessions { | 15 namespace sessions { |
16 | 16 |
17 // Grouping of all state that applies to all model types. Note that some | 17 // Grouping of all state that applies to all model types. Note that some |
18 // components of the global grouping can internally implement finer grained | 18 // components of the global grouping can internally implement finer grained |
19 // scope control, but the top level entity is still a singleton with respect to | 19 // scope control, but the top level entity is still a singleton with respect to |
20 // model types. | 20 // model types. |
21 struct SYNC_EXPORT ModelNeutralState { | 21 struct SYNC_EXPORT ModelNeutralState { |
22 ModelNeutralState(); | 22 ModelNeutralState(); |
23 ~ModelNeutralState(); | 23 ~ModelNeutralState(); |
24 | 24 |
25 // We GetUpdates for some combination of types at once. | 25 // We GetUpdates for some combination of types at once. |
26 // requested_update_types stores the set of types which were requested. | 26 // requested_update_types stores the set of types which were requested. |
27 ModelTypeSet updates_request_types; | 27 ModelTypeSet updates_request_types; |
28 | 28 |
| 29 // The set of types for which commits were sent to the server. |
| 30 ModelTypeSet commit_request_types; |
| 31 |
29 sync_pb::ClientToServerResponse updates_response; | 32 sync_pb::ClientToServerResponse updates_response; |
30 | 33 |
31 int num_successful_commits; | 34 int num_successful_commits; |
32 | 35 |
33 // This is needed for monitoring extensions activity. | 36 // This is needed for monitoring extensions activity. |
34 int num_successful_bookmark_commits; | 37 int num_successful_bookmark_commits; |
35 | 38 |
36 // Download event counters. | 39 // Download event counters. |
37 int num_updates_downloaded_total; | 40 int num_updates_downloaded_total; |
38 int num_tombstone_updates_downloaded_total; | 41 int num_tombstone_updates_downloaded_total; |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 // really is nothing more to download. | 75 // really is nothing more to download. |
73 int64 num_server_changes_remaining; | 76 int64 num_server_changes_remaining; |
74 }; | 77 }; |
75 | 78 |
76 bool HasSyncerError(const ModelNeutralState& state); | 79 bool HasSyncerError(const ModelNeutralState& state); |
77 | 80 |
78 } // namespace sessions | 81 } // namespace sessions |
79 } // namespace syncer | 82 } // namespace syncer |
80 | 83 |
81 #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ | 84 #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ |
OLD | NEW |