Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: sync/sessions/sync_session.h

Issue 25638003: sync: Implement per-type commit interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix win compile Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/sessions/status_controller.h ('k') | sync/sessions/sync_session_context.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // A class representing an attempt to synchronize the local syncable data 5 // A class representing an attempt to synchronize the local syncable data
6 // store with a sync server. A SyncSession instance is passed as a stateful 6 // store with a sync server. A SyncSession instance is passed as a stateful
7 // bundle to and from various SyncerCommands with the goal of converging the 7 // bundle to and from various SyncerCommands with the goal of converging the
8 // client view of data with that of the server. The commands twiddle with 8 // client view of data with that of the server. The commands twiddle with
9 // session status in response to events and hiccups along the way, set and 9 // session status in response to events and hiccups along the way, set and
10 // query session progress with regards to conflict resolution and applying 10 // query session progress with regards to conflict resolution and applying
11 // server updates, and access the SyncSessionContext for the current session 11 // server updates, and access the SyncSessionContext for the current session
12 // via SyncSession instances. 12 // via SyncSession instances.
13 13
14 #ifndef SYNC_SESSIONS_SYNC_SESSION_H_ 14 #ifndef SYNC_SESSIONS_SYNC_SESSION_H_
15 #define SYNC_SESSIONS_SYNC_SESSION_H_ 15 #define SYNC_SESSIONS_SYNC_SESSION_H_
16 16
17 #include <map> 17 #include <map>
18 #include <set> 18 #include <set>
19 #include <string> 19 #include <string>
20 #include <utility> 20 #include <utility>
21 #include <vector> 21 #include <vector>
22 22
23 #include "base/basictypes.h" 23 #include "base/basictypes.h"
24 #include "base/memory/scoped_ptr.h" 24 #include "base/memory/scoped_ptr.h"
25 #include "base/time/time.h" 25 #include "base/time/time.h"
26 #include "sync/base/sync_export.h" 26 #include "sync/base/sync_export.h"
27 #include "sync/internal_api/public/base/model_type.h" 27 #include "sync/internal_api/public/base/model_type.h"
28 #include "sync/internal_api/public/engine/model_safe_worker.h" 28 #include "sync/internal_api/public/engine/model_safe_worker.h"
29 #include "sync/internal_api/public/sessions/sync_session_snapshot.h" 29 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
30 #include "sync/sessions/ordered_commit_set.h"
31 #include "sync/sessions/status_controller.h" 30 #include "sync/sessions/status_controller.h"
32 #include "sync/sessions/sync_session_context.h" 31 #include "sync/sessions/sync_session_context.h"
33 32
34 namespace syncer { 33 namespace syncer {
35 class ModelSafeWorker; 34 class ModelSafeWorker;
36 35
37 namespace sessions { 36 namespace sessions {
38 37
39 class NudgeTracker; 38 class NudgeTracker;
40 39
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // Our controller for various status and error counters. 139 // Our controller for various status and error counters.
141 scoped_ptr<StatusController> status_controller_; 140 scoped_ptr<StatusController> status_controller_;
142 141
143 DISALLOW_COPY_AND_ASSIGN(SyncSession); 142 DISALLOW_COPY_AND_ASSIGN(SyncSession);
144 }; 143 };
145 144
146 } // namespace sessions 145 } // namespace sessions
147 } // namespace syncer 146 } // namespace syncer
148 147
149 #endif // SYNC_SESSIONS_SYNC_SESSION_H_ 148 #endif // SYNC_SESSIONS_SYNC_SESSION_H_
OLDNEW
« no previous file with comments | « sync/sessions/status_controller.h ('k') | sync/sessions/sync_session_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698