From 06aeba61e19bc26ec0ff993b56a6a1a4a20d72bd Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Fri, 22 Jun 2012 07:35:26 +0000 Subject: [Sync] Rename sync_api to csync BUG=128060 TEST= Review URL: https://chromiumcodereview.appspot.com/10601002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143557 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/engine/all_status.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sync/engine/all_status.cc') diff --git a/sync/engine/all_status.cc b/sync/engine/all_status.cc index 63a7d0f..6a642db 100644 --- a/sync/engine/all_status.cc +++ b/sync/engine/all_status.cc @@ -24,11 +24,11 @@ AllStatus::AllStatus() { AllStatus::~AllStatus() { } -sync_api::SyncStatus AllStatus::CreateBlankStatus() const { +csync::SyncStatus AllStatus::CreateBlankStatus() const { // Status is initialized with the previous status value. Variables // whose values accumulate (e.g. lifetime counters like updates_received) // are not to be cleared here. - sync_api::SyncStatus status = status_; + csync::SyncStatus status = status_; status.encryption_conflicts = 0; status.hierarchy_conflicts = 0; status.simple_conflicts = 0; @@ -39,9 +39,9 @@ sync_api::SyncStatus AllStatus::CreateBlankStatus() const { return status; } -sync_api::SyncStatus AllStatus::CalcSyncing( +csync::SyncStatus AllStatus::CalcSyncing( const SyncEngineEvent &event) const { - sync_api::SyncStatus status = CreateBlankStatus(); + csync::SyncStatus status = CreateBlankStatus(); const sessions::SyncSessionSnapshot& snapshot = event.snapshot; status.encryption_conflicts = snapshot.num_encryption_conflicts(); status.hierarchy_conflicts = snapshot.num_hierarchy_conflicts(); @@ -117,7 +117,7 @@ void AllStatus::OnSyncEngineEvent(const SyncEngineEvent& event) { } } -sync_api::SyncStatus AllStatus::status() const { +csync::SyncStatus AllStatus::status() const { base::AutoLock lock(mutex_); return status_; } -- cgit v1.1