| 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 // 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 CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_H_ | 14 #ifndef SYNC_SESSIONS_SYNC_SESSION_H_ |
| 15 #define CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_H_ | 15 #define SYNC_SESSIONS_SYNC_SESSION_H_ |
| 16 #pragma once | 16 #pragma once |
| 17 | 17 |
| 18 #include <map> | 18 #include <map> |
| 19 #include <set> | 19 #include <set> |
| 20 #include <string> | 20 #include <string> |
| 21 #include <utility> | 21 #include <utility> |
| 22 #include <vector> | 22 #include <vector> |
| 23 | 23 |
| 24 #include "base/basictypes.h" | 24 #include "base/basictypes.h" |
| 25 #include "base/memory/scoped_ptr.h" | 25 #include "base/memory/scoped_ptr.h" |
| 26 #include "base/time.h" | 26 #include "base/time.h" |
| 27 #include "chrome/browser/sync/engine/model_safe_worker.h" | 27 #include "sync/engine/model_safe_worker.h" |
| 28 #include "chrome/browser/sync/sessions/ordered_commit_set.h" | 28 #include "sync/sessions/ordered_commit_set.h" |
| 29 #include "chrome/browser/sync/sessions/session_state.h" | 29 #include "sync/sessions/session_state.h" |
| 30 #include "chrome/browser/sync/sessions/status_controller.h" | 30 #include "sync/sessions/status_controller.h" |
| 31 #include "chrome/browser/sync/sessions/sync_session_context.h" | 31 #include "sync/sessions/sync_session_context.h" |
| 32 #include "chrome/browser/sync/syncable/model_type.h" | 32 #include "sync/syncable/model_type.h" |
| 33 #include "chrome/browser/sync/util/extensions_activity_monitor.h" | 33 #include "sync/util/extensions_activity_monitor.h" |
| 34 | 34 |
| 35 namespace syncable { | 35 namespace syncable { |
| 36 class WriteTransaction; | 36 class WriteTransaction; |
| 37 } | 37 } |
| 38 | 38 |
| 39 namespace browser_sync { | 39 namespace browser_sync { |
| 40 class ModelSafeWorker; | 40 class ModelSafeWorker; |
| 41 | 41 |
| 42 namespace sessions { | 42 namespace sessions { |
| 43 | 43 |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 ~ScopedSetSessionWriteTransaction() { session_->write_transaction_ = NULL; } | 230 ~ScopedSetSessionWriteTransaction() { session_->write_transaction_ = NULL; } |
| 231 | 231 |
| 232 private: | 232 private: |
| 233 SyncSession* session_; | 233 SyncSession* session_; |
| 234 DISALLOW_COPY_AND_ASSIGN(ScopedSetSessionWriteTransaction); | 234 DISALLOW_COPY_AND_ASSIGN(ScopedSetSessionWriteTransaction); |
| 235 }; | 235 }; |
| 236 | 236 |
| 237 } // namespace sessions | 237 } // namespace sessions |
| 238 } // namespace browser_sync | 238 } // namespace browser_sync |
| 239 | 239 |
| 240 #endif // CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_H_ | 240 #endif // SYNC_SESSIONS_SYNC_SESSION_H_ |
| OLD | NEW |