summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-11 13:56:43 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-11 13:56:43 +0000
commit325c350df9c95200a5363a3a4ef9dea4af5d807e (patch)
treec3d45d16a034f61b83b1295c43c021298f564901 /sync/internal_api/public
parent3d146b44d0be75328ac1873042141ba76778cfc0 (diff)
downloadchromium_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/internal_api/public')
-rw-r--r--sync/internal_api/public/sessions/model_neutral_state.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h
index 4979d3a..beafcb9 100644
--- a/sync/internal_api/public/sessions/model_neutral_state.h
+++ b/sync/internal_api/public/sessions/model_neutral_state.h
@@ -7,9 +7,9 @@
#include "base/basictypes.h"
#include "sync/base/sync_export.h"
+#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/util/syncer_error.h"
#include "sync/protocol/sync.pb.h"
-#include "sync/protocol/sync_protocol_error.h"
namespace syncer {
namespace sessions {
@@ -49,9 +49,6 @@ struct SYNC_EXPORT ModelNeutralState {
int num_local_overwrites;
int num_server_overwrites;
- // Any protocol errors that we received during this sync session.
- SyncProtocolError sync_protocol_error;
-
// Records the most recent results of GetKey, PostCommit and GetUpdates
// commands.
SyncerError last_get_key_result;