Split up SyncEngineEventListener callbacks

sync/engine/all_status.h

 // Copyright (c) 2012 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.
 //
 // The AllStatus object watches various sync engine components and aggregates
 // the status of all of them into one place.
 
 #ifndef SYNC_INTERNAL_API_ALL_STATUS_H_
 #define SYNC_INTERNAL_API_ALL_STATUS_H_
 
 #include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/synchronization/lock.h"
-#include "sync/engine/sync_engine_event.h"
+#include "sync/engine/sync_cycle_event.h"

[Nicolas Zea, 2014/02/11 00:35:05]

forward declare

[rlarocque, 2014/02/11 00:48:28]

Done.

+#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"
 #include "sync/engine/nudge_source.h"
 
 namespace syncer {
 
 class ScopedStatusLock;
 struct ServerConnectionEvent;
 
 // This class collects data and uses it to update its internal state.  It can
 // return a snapshot of this state as a SyncerStatus object.
 //
 // Most of this data ends up on the about:sync page.  But the page is only
 // 'pinged' to update itself at the end of a sync cycle.  A user could refresh
 // manually, but unless their timing is excellent it's unlikely that a user will
 // see any state in mid-sync cycle.  We have no plans to change this.  However,
 // we will continue to collect data and update state mid-sync-cycle in case we
 // need to debug slow or stuck sync cycles.
 class AllStatus : public SyncEngineEventListener {
   friend class ScopedStatusLock;
  public:
   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;
 
   void SetNotificationsEnabled(bool notifications_enabled);
 
   void IncrementNotifiableCommits();
 
   void IncrementNotificationsReceived();
 
   void SetEncryptedTypes(ModelTypeSet types);
   void SetCryptographerReady(bool ready);
   void SetCryptoHasPendingKeys(bool has_pending_keys);
   void SetPassphraseType(PassphraseType type);
   void SetHasKeystoreKey(bool has_keystore_key);
   void SetKeystoreMigrationTime(const base::Time& migration_time);
 
   void SetSyncId(const std::string& sync_id);
   void SetInvalidatorClientId(const std::string& invalidator_client_id);
 
   void IncrementNudgeCounter(NudgeSource source);
 
  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_;
 
   mutable base::Lock mutex_;  // Protects all data members.
   DISALLOW_COPY_AND_ASSIGN(AllStatus);
 };
 
 class ScopedStatusLock {
  public:
   explicit ScopedStatusLock(AllStatus* allstatus);
   ~ScopedStatusLock();
  protected:
   AllStatus* allstatus_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_ALL_STATUS_H_