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

Side by Side Diff: chrome/browser/sync/engine/conflict_resolution_view.cc

Issue 194065: Initial commit of sync engine code to browser/sync.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fixes to gtest include path, reverted syncapi. Created 11 years, 3 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
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
(Empty)
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4 //
5 // THIS CLASS PROVIDES NO SYNCHRONIZATION GUARANTEES.
6
7 #include "chrome/browser/sync/engine/conflict_resolution_view.h"
8
9 #include <map>
10 #include <set>
11
12 #include "chrome/browser/sync/engine/sync_process_state.h"
13 #include "chrome/browser/sync/engine/syncer_session.h"
14
15 using std::map;
16 using std::set;
17
18 namespace browser_sync {
19
20 ConflictResolutionView::ConflictResolutionView(SyncerSession* session)
21 : process_state_(session->sync_process_state_) {}
22
23 int ConflictResolutionView::conflicting_updates() const {
24 return process_state_->conflicting_updates();
25 }
26
27 int ConflictResolutionView::conflicting_commits() const {
28 return process_state_->conflicting_commits();
29 }
30
31 void ConflictResolutionView::set_conflicting_commits(const int val) {
32 process_state_->set_conflicting_commits(val);
33 }
34
35 int ConflictResolutionView::num_sync_cycles() const {
36 return process_state_->num_sync_cycles_;
37 }
38
39 void ConflictResolutionView::increment_num_sync_cycles() {
40 ++(process_state_->num_sync_cycles_);
41 }
42
43 void ConflictResolutionView::zero_num_sync_cycles() {
44 process_state_->num_sync_cycles_ = 0;
45 }
46
47 int64 ConflictResolutionView::current_sync_timestamp() const {
48 return process_state_->current_sync_timestamp();
49 }
50
51 int64 ConflictResolutionView::servers_latest_timestamp() const {
52 return process_state_->servers_latest_timestamp();
53 }
54
55 // True iff we're stuck. User should contact support.
56 bool ConflictResolutionView::syncer_stuck() const {
57 return process_state_->syncer_stuck();
58 }
59
60 void ConflictResolutionView::set_syncer_stuck(const bool val) {
61 process_state_->set_syncer_stuck(val);
62 }
63
64 IdToConflictSetMap::const_iterator ConflictResolutionView::IdToConflictSetFind(
65 const syncable::Id& the_id) const {
66 return process_state_->IdToConflictSetFind(the_id);
67 }
68
69 IdToConflictSetMap::const_iterator
70 ConflictResolutionView::IdToConflictSetBegin() const {
71 return process_state_->IdToConflictSetBegin();
72 }
73
74 IdToConflictSetMap::const_iterator
75 ConflictResolutionView::IdToConflictSetEnd() const {
76 return process_state_->IdToConflictSetEnd();
77 }
78
79 IdToConflictSetMap::size_type
80 ConflictResolutionView::IdToConflictSetSize() const {
81 return process_state_->IdToConflictSetSize();
82 }
83
84 const ConflictSet*
85 ConflictResolutionView::IdToConflictSetGet(const syncable::Id& the_id) {
86 return process_state_->IdToConflictSetGet(the_id);
87 }
88
89 set<ConflictSet*>::const_iterator
90 ConflictResolutionView::ConflictSetsBegin() const {
91 return process_state_->ConflictSetsBegin();
92 }
93
94 set<ConflictSet*>::const_iterator
95 ConflictResolutionView::ConflictSetsEnd() const {
96 return process_state_->ConflictSetsEnd();
97 }
98
99 set<ConflictSet*>::size_type
100 ConflictResolutionView::ConflictSetsSize() const {
101 return process_state_->ConflictSetsSize();
102 }
103
104 void ConflictResolutionView::MergeSets(const syncable::Id& set1,
105 const syncable::Id& set2) {
106 process_state_->MergeSets(set1, set2);
107 }
108
109 void ConflictResolutionView::CleanupSets() {
110 process_state_->CleanupSets();
111 }
112
113 bool ConflictResolutionView::HasCommitConflicts() const {
114 return process_state_->HasConflictingItems();
115 }
116
117 bool ConflictResolutionView::HasBlockedItems() const {
118 return process_state_->HasBlockedItems();
119 }
120
121 int ConflictResolutionView::CommitConflictsSize() const {
122 return process_state_->ConflictingItemsSize();
123 }
124
125 int ConflictResolutionView::BlockedItemsSize() const {
126 return process_state_->BlockedItemsSize();
127 }
128
129 void ConflictResolutionView::AddCommitConflict(const syncable::Id& the_id) {
130 process_state_->AddConflictingItem(the_id);
131 }
132
133 void ConflictResolutionView::AddBlockedItem(const syncable::Id& the_id) {
134 process_state_->AddBlockedItem(the_id);
135 }
136
137 void ConflictResolutionView::EraseCommitConflict(
138 set<syncable::Id>::iterator it) {
139 process_state_->EraseConflictingItem(it);
140 }
141
142 void ConflictResolutionView::EraseBlockedItem(
143 set<syncable::Id>::iterator it) {
144 process_state_->EraseBlockedItem(it);
145 }
146
147 set<syncable::Id>::iterator
148 ConflictResolutionView::CommitConflictsBegin() const {
149 return process_state_->ConflictingItemsBegin();
150 }
151
152 set<syncable::Id>::iterator
153 ConflictResolutionView::BlockedItemsBegin() const {
154 return process_state_->BlockedItemsBegin();
155 }
156
157 set<syncable::Id>::iterator
158 ConflictResolutionView::CommitConflictsEnd() const {
159 return process_state_->ConflictingItemsEnd();
160 }
161
162 set<syncable::Id>::iterator
163 ConflictResolutionView::BlockedItemsEnd() const {
164 return process_state_->BlockedItemsEnd();
165 }
166
167 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698