summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/conflict_resolver.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 07:55:20 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 07:55:20 +0000
commit74a82ca6ee3940312df1a0a966a6cf9eafcf3314 (patch)
treea5179d1b4a79c9950666e2b4fdae73af291f41cc /chrome/browser/sync/engine/conflict_resolver.h
parent7477b27103e20e1898b1c2846f2fc3e08d498576 (diff)
downloadchromium_src-74a82ca6ee3940312df1a0a966a6cf9eafcf3314.zip
chromium_src-74a82ca6ee3940312df1a0a966a6cf9eafcf3314.tar.gz
chromium_src-74a82ca6ee3940312df1a0a966a6cf9eafcf3314.tar.bz2
[Sync] Made some sync session member functions const
In particular, split SyncSession::status_controller() into status_controller() and mutable_status_controller(). Also remove some dead code. Propagate const methods throughout sync code. This is in preparation for an upcoming change that makes ModelChangingSyncerCommand post on only the threads it needs to. BUG=97832 TEST= Review URL: http://codereview.chromium.org/8638001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/conflict_resolver.h')
-rw-r--r--chrome/browser/sync/engine/conflict_resolver.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index 9bec0d5..c622794 100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -26,9 +26,11 @@ class WriteTransaction;
} // namespace syncable
namespace browser_sync {
+
namespace sessions {
+class ConflictProgress;
class StatusController;
-}
+} // namespace sessions
class ConflictResolver {
friend class SyncerTest;
@@ -40,6 +42,7 @@ class ConflictResolver {
// Called by the syncer at the end of a update/commit cycle.
// Returns true if the syncer should try to apply its updates again.
bool ResolveConflicts(const syncable::ScopedDirLookup& dir,
+ const sessions::ConflictProgress& progress,
sessions::StatusController* status);
private:
@@ -70,6 +73,7 @@ class ConflictResolver {
sessions::StatusController* status);
bool ResolveSimpleConflicts(const syncable::ScopedDirLookup& dir,
+ const sessions::ConflictProgress& progress,
sessions::StatusController* status);
bool ProcessConflictSet(syncable::WriteTransaction* trans,