OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "chrome/browser/sync/sessions/session_state.h" | 5 #include "chrome/browser/sync/sessions/session_state.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 using std::set; | 10 using std::set; |
(...skipping 22 matching lines...) Expand all Loading... |
33 const SyncerStatus& syncer_status, | 33 const SyncerStatus& syncer_status, |
34 const ErrorCounters& errors, | 34 const ErrorCounters& errors, |
35 int64 num_server_changes_remaining, | 35 int64 num_server_changes_remaining, |
36 bool is_share_usable, | 36 bool is_share_usable, |
37 const syncable::ModelTypeBitSet& initial_sync_ended, | 37 const syncable::ModelTypeBitSet& initial_sync_ended, |
38 std::string download_progress_markers[syncable::MODEL_TYPE_COUNT], | 38 std::string download_progress_markers[syncable::MODEL_TYPE_COUNT], |
39 bool more_to_sync, | 39 bool more_to_sync, |
40 bool is_silenced, | 40 bool is_silenced, |
41 int64 unsynced_count, | 41 int64 unsynced_count, |
42 int num_conflicting_updates, | 42 int num_conflicting_updates, |
43 bool did_commit_items) | 43 bool did_commit_items, |
| 44 const SyncSourceInfo& source) |
44 : syncer_status(syncer_status), | 45 : syncer_status(syncer_status), |
45 errors(errors), | 46 errors(errors), |
46 num_server_changes_remaining(num_server_changes_remaining), | 47 num_server_changes_remaining(num_server_changes_remaining), |
47 is_share_usable(is_share_usable), | 48 is_share_usable(is_share_usable), |
48 initial_sync_ended(initial_sync_ended), | 49 initial_sync_ended(initial_sync_ended), |
49 download_progress_markers(), | 50 download_progress_markers(), |
50 has_more_to_sync(more_to_sync), | 51 has_more_to_sync(more_to_sync), |
51 is_silenced(is_silenced), | 52 is_silenced(is_silenced), |
52 unsynced_count(unsynced_count), | 53 unsynced_count(unsynced_count), |
53 num_conflicting_updates(num_conflicting_updates), | 54 num_conflicting_updates(num_conflicting_updates), |
54 did_commit_items(did_commit_items) { | 55 did_commit_items(did_commit_items), |
| 56 source(source) { |
55 for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) { | 57 for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) { |
56 const_cast<std::string&>(this->download_progress_markers[i]).assign( | 58 const_cast<std::string&>(this->download_progress_markers[i]).assign( |
57 download_progress_markers[i]); | 59 download_progress_markers[i]); |
58 } | 60 } |
59 } | 61 } |
60 | 62 |
61 SyncSessionSnapshot::~SyncSessionSnapshot() {} | 63 SyncSessionSnapshot::~SyncSessionSnapshot() {} |
62 | 64 |
63 ConflictProgress::ConflictProgress(bool* dirty_flag) : dirty_(dirty_flag) {} | 65 ConflictProgress::ConflictProgress(bool* dirty_flag) : dirty_(dirty_flag) {} |
64 | 66 |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 | 255 |
254 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) | 256 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) |
255 : conflict_progress(dirty_flag) { | 257 : conflict_progress(dirty_flag) { |
256 } | 258 } |
257 | 259 |
258 PerModelSafeGroupState::~PerModelSafeGroupState() { | 260 PerModelSafeGroupState::~PerModelSafeGroupState() { |
259 } | 261 } |
260 | 262 |
261 } // namespace sessions | 263 } // namespace sessions |
262 } // namespace browser_sync | 264 } // namespace browser_sync |
OLD | NEW |