Chromium Code Reviews| Index: sync/sessions/session_state.h |
| diff --git a/sync/sessions/session_state.h b/sync/sessions/session_state.h |
| index 3f37cd03ed33afe0cb9f2a74be6de0b60f322967..53698334efc9bfe7d54b24d8629cd4a26aa5894e 100644 |
| --- a/sync/sessions/session_state.h |
| +++ b/sync/sessions/session_state.h |
| @@ -23,7 +23,6 @@ |
| #include "sync/engine/syncer_types.h" |
| #include "sync/engine/syncproto.h" |
| #include "sync/protocol/sync_protocol_error.h" |
| -#include "sync/sessions/ordered_commit_set.h" |
| #include "sync/syncable/model_type.h" |
| #include "sync/syncable/model_type_payload_map.h" |
| #include "sync/syncable/syncable.h" |
| @@ -114,12 +113,10 @@ class SyncSessionSnapshot { |
| const syncable::ModelTypePayloadMap& download_progress_markers, |
| bool more_to_sync, |
| bool is_silenced, |
| - int64 unsynced_count, |
| int num_encryption_conflicts, |
| int num_hierarchy_conflicts, |
| int num_simple_conflicts, |
| int num_server_conflicts, |
| - bool did_commit_items, |
|
tim (not reviewing)
2012/05/11 18:42:16
Where is this captured, again?
rlarocque
2012/05/14 23:10:43
It was based on control_params.items_comitted, whi
|
| const SyncSourceInfo& source, |
| bool notifications_enabled, |
| size_t num_entries, |
| @@ -166,7 +163,6 @@ class SyncSessionSnapshot { |
| int num_hierarchy_conflicts_; |
| int num_simple_conflicts_; |
| int num_server_conflicts_; |
| - bool did_commit_items_; |
| SyncSourceInfo source_; |
| bool notifications_enabled_; |
| size_t num_entries_; |
| @@ -321,20 +317,15 @@ struct AllModelTypeState { |
| explicit AllModelTypeState(bool* dirty_flag); |
| ~AllModelTypeState(); |
| - // Commits for all model types are bundled together into a single message. |
| - ClientToServerMessage commit_message; |
| - ClientToServerResponse commit_response; |
| // We GetUpdates for some combination of types at once. |
| // requested_update_types stores the set of types which were requested. |
| syncable::ModelTypeSet updates_request_types; |
| ClientToServerResponse updates_response; |
| // Used to build the shared commit message. |
| - DirtyOnWrite<std::vector<int64> > unsynced_handles; |
| DirtyOnWrite<SyncerStatus> syncer_status; |
| DirtyOnWrite<ErrorCounters> error; |
| SyncCycleControlParameters control_params; |
| DirtyOnWrite<int64> num_server_changes_remaining; |
| - OrderedCommitSet commit_set; |
| }; |
| // Grouping of all state that applies to a single ModelSafeGroup. |