Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1058)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/public/sessions/model_neutral_state.h

Issue 152013003: Split up SyncEngineEventListener callbacks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try to fix chunk mismatch Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« sync/engine/sync_engine_event.h ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/sync_manager_impl.h » ('j') | sync/internal_api/sync_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/sessions/model_neutral_state.h
diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h
index 4979d3ad10117b02d926cd467394382a0c16cbeb..beafcb94d6eb43e0e66430e9a31ae8a6d418514a 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;
« sync/engine/sync_engine_event.h ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/sync_manager_impl.h » ('j') | sync/internal_api/sync_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698