diff options
author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 13:56:43 +0000 |
---|---|---|
committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 13:56:43 +0000 |
commit | 325c350df9c95200a5363a3a4ef9dea4af5d807e (patch) | |
tree | c3d45d16a034f61b83b1295c43c021298f564901 /sync/sessions/sync_session.h | |
parent | 3d146b44d0be75328ac1873042141ba76778cfc0 (diff) | |
download | chromium_src-325c350df9c95200a5363a3a4ef9dea4af5d807e.zip chromium_src-325c350df9c95200a5363a3a4ef9dea4af5d807e.tar.gz chromium_src-325c350df9c95200a5363a3a4ef9dea4af5d807e.tar.bz2 |
Split up SyncEngineEventListener callbacks
Splits up the SyncEngineEventListener calls into one callback per event
type. This allow us to trim the 'event' objects so they only contain
elements relevant to their event.
Also removes some dead code related to STOP_SYNCING_PERMANENTLY, which
is no longer in use. It may have been used for birthday errors in the
past, but those are now handled with ActionableError. It was used for
CLEAR_USER_DATA, but that feature is no longer supported.
BUG=339984
Review URL: https://codereview.chromium.org/152013003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions/sync_session.h')
-rw-r--r-- | sync/sessions/sync_session.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h index e25c718..a0e4176 100644 --- a/sync/sessions/sync_session.h +++ b/sync/sessions/sync_session.h @@ -20,9 +20,11 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "sync/base/sync_export.h" +#include "sync/engine/sync_cycle_event.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" +#include "sync/protocol/sync_protocol_error.h" #include "sync/sessions/status_controller.h" #include "sync/sessions/sync_session_context.h" @@ -75,7 +77,7 @@ class SYNC_EXPORT_PRIVATE SyncSession { // Called for the syncer to respond to the error sent by the server. virtual void OnSyncProtocolError( - const sessions::SyncSessionSnapshot& snapshot) = 0; + const SyncProtocolError& sync_protocol_error) = 0; // Called when the server wants to change the number of hints the client // will buffer locally. @@ -103,7 +105,7 @@ class SYNC_EXPORT_PRIVATE SyncSession { // Builds and sends a snapshot to the session context's listeners. void SendSyncCycleEndEventNotification( sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source); - void SendEventNotification(SyncEngineEvent::EventCause cause); + void SendEventNotification(SyncCycleEvent::EventCause cause); // TODO(akalin): Split this into context() and mutable_context(). SyncSessionContext* context() const { return context_; } |