| Index: sync/engine/all_status.h
|
| diff --git a/sync/engine/all_status.h b/sync/engine/all_status.h
|
| index 8954eaeb99a7d8eaff4341f79cd56503383cac40..b30d2ae89ab5e958fc6d6e5c3276ad39b52ea51d 100644
|
| --- a/sync/engine/all_status.h
|
| +++ b/sync/engine/all_status.h
|
| @@ -13,7 +13,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "sync/engine/sync_engine_event.h"
|
| +#include "sync/engine/sync_engine_event_listener.h"
|
| #include "sync/engine/syncer_types.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| #include "sync/internal_api/public/engine/sync_status.h"
|
| @@ -23,6 +23,7 @@ namespace syncer {
|
|
|
| class ScopedStatusLock;
|
| struct ServerConnectionEvent;
|
| +struct SyncCycleEvent;
|
|
|
| // This class collects data and uses it to update its internal state. It can
|
| // return a snapshot of this state as a SyncerStatus object.
|
| @@ -39,7 +40,11 @@ class AllStatus : public SyncEngineEventListener {
|
| AllStatus();
|
| virtual ~AllStatus();
|
|
|
| - virtual void OnSyncEngineEvent(const SyncEngineEvent& event) OVERRIDE;
|
| + // SyncEngineEventListener implementation.
|
| + virtual void OnSyncCycleEvent(const SyncCycleEvent& event) OVERRIDE;
|
| + virtual void OnActionableError(const SyncProtocolError& error) OVERRIDE;
|
| + virtual void OnRetryTimeChanged(base::Time retry_time) OVERRIDE;
|
| + virtual void OnThrottledTypesChanged(ModelTypeSet throttled_types) OVERRIDE;
|
|
|
| SyncStatus status() const;
|
|
|
| @@ -64,7 +69,7 @@ class AllStatus : public SyncEngineEventListener {
|
| protected:
|
| // Examines syncer to calculate syncing and the unsynced count,
|
| // and returns a Status with new values.
|
| - SyncStatus CalcSyncing(const SyncEngineEvent& event) const;
|
| + SyncStatus CalcSyncing(const SyncCycleEvent& event) const;
|
| SyncStatus CreateBlankStatus() const;
|
|
|
| SyncStatus status_;
|
|
|