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 CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_ | 12 #ifndef SYNC_SESSIONS_SESSION_STATE_H_ |
13 #define CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_ | 13 #define SYNC_SESSIONS_SESSION_STATE_H_ |
14 #pragma once | 14 #pragma once |
15 | 15 |
16 #include <map> | 16 #include <map> |
17 #include <set> | 17 #include <set> |
18 #include <string> | 18 #include <string> |
19 #include <utility> | 19 #include <utility> |
20 #include <vector> | 20 #include <vector> |
21 | 21 |
22 #include "base/basictypes.h" | 22 #include "base/basictypes.h" |
23 #include "chrome/browser/sync/engine/syncer_types.h" | 23 #include "sync/engine/syncer_types.h" |
24 #include "chrome/browser/sync/engine/syncproto.h" | 24 #include "sync/engine/syncproto.h" |
25 #include "chrome/browser/sync/sessions/ordered_commit_set.h" | 25 #include "sync/protocol/sync_protocol_error.h" |
26 #include "chrome/browser/sync/protocol/sync_protocol_error.h" | 26 #include "sync/sessions/ordered_commit_set.h" |
27 #include "chrome/browser/sync/syncable/model_type.h" | 27 #include "sync/syncable/model_type.h" |
28 #include "chrome/browser/sync/syncable/model_type_payload_map.h" | 28 #include "sync/syncable/model_type_payload_map.h" |
29 #include "chrome/browser/sync/syncable/syncable.h" | 29 #include "sync/syncable/syncable.h" |
30 | 30 |
31 namespace base { | 31 namespace base { |
32 class DictionaryValue; | 32 class DictionaryValue; |
33 } | 33 } |
34 | 34 |
35 namespace browser_sync { | 35 namespace browser_sync { |
36 namespace sessions { | 36 namespace sessions { |
37 | 37 |
38 class UpdateProgress; | 38 class UpdateProgress; |
39 | 39 |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 explicit PerModelSafeGroupState(bool* dirty_flag); | 319 explicit PerModelSafeGroupState(bool* dirty_flag); |
320 ~PerModelSafeGroupState(); | 320 ~PerModelSafeGroupState(); |
321 | 321 |
322 UpdateProgress update_progress; | 322 UpdateProgress update_progress; |
323 ConflictProgress conflict_progress; | 323 ConflictProgress conflict_progress; |
324 }; | 324 }; |
325 | 325 |
326 } // namespace sessions | 326 } // namespace sessions |
327 } // namespace browser_sync | 327 } // namespace browser_sync |
328 | 328 |
329 #endif // CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_ | 329 #endif // SYNC_SESSIONS_SESSION_STATE_H_ |
OLD | NEW |