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 // The 'sessions' namespace comprises all the pieces of state that are | 5 // The 'sessions' namespace comprises all the pieces of state that are |
6 // combined to form a SyncSession instance. In that way, it can be thought of | 6 // combined to form a SyncSession instance. In that way, it can be thought of |
7 // as an extension of the SyncSession type itself. Session scoping gives | 7 // as an extension of the SyncSession type itself. Session scoping gives |
8 // context to things like "conflict progress", "update progress", etc, and the | 8 // context to things like "conflict progress", "update progress", etc, and the |
9 // separation this file provides allows clients to only include the parts they | 9 // separation this file provides allows clients to only include the parts they |
10 // need rather than the entire session stack. | 10 // need rather than the entire session stack. |
11 | 11 |
12 #ifndef SYNC_SESSIONS_SESSION_STATE_H_ | 12 #ifndef SYNC_SESSIONS_SESSION_STATE_H_ |
13 #define SYNC_SESSIONS_SESSION_STATE_H_ | 13 #define SYNC_SESSIONS_SESSION_STATE_H_ |
14 | 14 |
15 #include <set> | 15 #include <set> |
16 #include <vector> | 16 #include <vector> |
17 | 17 |
18 #include "sync/engine/syncer_types.h" | 18 #include "sync/engine/syncer_types.h" |
19 #include "sync/engine/syncproto.h" | 19 #include "sync/protocol/sync.pb.h" |
20 #include "sync/syncable/syncable_id.h" | 20 #include "sync/syncable/syncable_id.h" |
21 | 21 |
22 namespace syncer { | 22 namespace syncer { |
23 namespace sessions { | 23 namespace sessions { |
24 | 24 |
25 // Tracks progress of conflicts and their resolutions. | 25 // Tracks progress of conflicts and their resolutions. |
26 class ConflictProgress { | 26 class ConflictProgress { |
27 public: | 27 public: |
28 explicit ConflictProgress(); | 28 explicit ConflictProgress(); |
29 ~ConflictProgress(); | 29 ~ConflictProgress(); |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 ~PerModelSafeGroupState(); | 124 ~PerModelSafeGroupState(); |
125 | 125 |
126 UpdateProgress update_progress; | 126 UpdateProgress update_progress; |
127 ConflictProgress conflict_progress; | 127 ConflictProgress conflict_progress; |
128 }; | 128 }; |
129 | 129 |
130 } // namespace sessions | 130 } // namespace sessions |
131 } // namespace syncer | 131 } // namespace syncer |
132 | 132 |
133 #endif // SYNC_SESSIONS_SESSION_STATE_H_ | 133 #endif // SYNC_SESSIONS_SESSION_STATE_H_ |
OLD | NEW |