| Index: sync/internal_api/sync_manager_impl.cc
|
| diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
|
| index accb7f2c1f1fd9fe546c638471ac98db01eefa29..3e38895f4ed803e1b53803d8c99f08824f2684de 100644
|
| --- a/sync/internal_api/sync_manager_impl.cc
|
| +++ b/sync/internal_api/sync_manager_impl.cc
|
| @@ -913,7 +913,7 @@ void SyncManagerImpl::RequestNudgeForDataTypes(
|
| nudge_location);
|
| }
|
|
|
| -void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
|
| +void SyncManagerImpl::OnSyncCycleEvent(const SyncCycleEvent& event) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| // Only send an event if this is due to a cycle ending and this cycle
|
| // concludes a canonical "sync" process; that is, based on what is known
|
| @@ -922,7 +922,7 @@ void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
|
| //
|
| // Notifications are sent at the end of every sync cycle, regardless of
|
| // whether we should sync again.
|
| - if (event.what_happened == SyncEngineEvent::SYNC_CYCLE_ENDED) {
|
| + if (event.what_happened == SyncCycleEvent::SYNC_CYCLE_ENDED) {
|
| if (!initialized_) {
|
| DVLOG(1) << "OnSyncCycleCompleted not sent because sync api is not "
|
| << "initialized";
|
| @@ -933,22 +933,18 @@ void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
|
| FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
|
| OnSyncCycleCompleted(event.snapshot));
|
| }
|
| +}
|
|
|
| - if (event.what_happened == SyncEngineEvent::STOP_SYNCING_PERMANENTLY) {
|
| - FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
|
| - OnStopSyncingPermanently());
|
| - return;
|
| - }
|
| -
|
| - if (event.what_happened == SyncEngineEvent::ACTIONABLE_ERROR) {
|
| - FOR_EACH_OBSERVER(
|
| - SyncManager::Observer, observers_,
|
| - OnActionableError(
|
| - event.snapshot.model_neutral_state().sync_protocol_error));
|
| - return;
|
| - }
|
| +void SyncManagerImpl::OnActionableError(const SyncProtocolError& error) {
|
| + FOR_EACH_OBSERVER(
|
| + SyncManager::Observer, observers_,
|
| + OnActionableError(error));
|
| }
|
|
|
| +void SyncManagerImpl::OnRetryTimeChanged(base::Time) {}
|
| +
|
| +void SyncManagerImpl::OnThrottledTypesChanged(ModelTypeSet) {}
|
| +
|
| void SyncManagerImpl::SetJsEventHandler(
|
| const WeakHandle<JsEventHandler>& event_handler) {
|
| js_event_handler_ = event_handler;
|
|
|