blob: e4e8620e9a3e3904cf1dcf4697954d770a5f6f95 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// THIS CLASS PROVIDES NO SYNCHRONIZATION GUARANTEES.
#include "chrome/browser/sync/engine/conflict_resolution_view.h"
#include <map>
#include <set>
#include "chrome/browser/sync/engine/sync_process_state.h"
#include "chrome/browser/sync/engine/syncer_session.h"
using std::map;
using std::set;
namespace browser_sync {
ConflictResolutionView::ConflictResolutionView(SyncerSession* session)
: process_state_(session->sync_process_state_) {}
int ConflictResolutionView::conflicting_updates() const {
return process_state_->conflicting_updates();
}
int ConflictResolutionView::conflicting_commits() const {
return process_state_->conflicting_commits();
}
void ConflictResolutionView::set_conflicting_commits(const int val) {
process_state_->set_conflicting_commits(val);
}
int64 ConflictResolutionView::current_sync_timestamp() const {
return process_state_->current_sync_timestamp();
}
int64 ConflictResolutionView::num_server_changes_remaining() const {
return process_state_->num_server_changes_remaining();
}
// True iff we're stuck. User should contact support.
bool ConflictResolutionView::syncer_stuck() const {
return process_state_->syncer_stuck();
}
void ConflictResolutionView::set_syncer_stuck(const bool val) {
process_state_->set_syncer_stuck(val);
}
IdToConflictSetMap::const_iterator ConflictResolutionView::IdToConflictSetFind(
const syncable::Id& the_id) const {
return process_state_->IdToConflictSetFind(the_id);
}
IdToConflictSetMap::const_iterator
ConflictResolutionView::IdToConflictSetBegin() const {
return process_state_->IdToConflictSetBegin();
}
IdToConflictSetMap::const_iterator
ConflictResolutionView::IdToConflictSetEnd() const {
return process_state_->IdToConflictSetEnd();
}
IdToConflictSetMap::size_type
ConflictResolutionView::IdToConflictSetSize() const {
return process_state_->IdToConflictSetSize();
}
const ConflictSet*
ConflictResolutionView::IdToConflictSetGet(const syncable::Id& the_id) {
return process_state_->IdToConflictSetGet(the_id);
}
set<ConflictSet*>::const_iterator
ConflictResolutionView::ConflictSetsBegin() const {
return process_state_->ConflictSetsBegin();
}
set<ConflictSet*>::const_iterator
ConflictResolutionView::ConflictSetsEnd() const {
return process_state_->ConflictSetsEnd();
}
set<ConflictSet*>::size_type
ConflictResolutionView::ConflictSetsSize() const {
return process_state_->ConflictSetsSize();
}
void ConflictResolutionView::MergeSets(const syncable::Id& set1,
const syncable::Id& set2) {
process_state_->MergeSets(set1, set2);
}
void ConflictResolutionView::CleanupSets() {
process_state_->CleanupSets();
}
bool ConflictResolutionView::HasCommitConflicts() const {
return process_state_->HasConflictingItems();
}
int ConflictResolutionView::CommitConflictsSize() const {
return process_state_->ConflictingItemsSize();
}
void ConflictResolutionView::AddCommitConflict(const syncable::Id& the_id) {
process_state_->AddConflictingItem(the_id);
}
void ConflictResolutionView::EraseCommitConflict(
set<syncable::Id>::iterator it) {
process_state_->EraseConflictingItem(it);
}
set<syncable::Id>::iterator
ConflictResolutionView::CommitConflictsBegin() const {
return process_state_->ConflictingItemsBegin();
}
set<syncable::Id>::iterator
ConflictResolutionView::CommitConflictsEnd() const {
return process_state_->ConflictingItemsEnd();
}
} // namespace browser_sync
|
