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

Unified Diff: chrome/browser/sync/sessions/session_state.h

Issue 7861013: Fix the false-positive detection of commit errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another attempt at detecting errors Created 9 years, 2 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
Index: chrome/browser/sync/sessions/session_state.h
diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h
index c6ee65ba598ec4838c4b0097189368e3613b079a..2e5c7b350fd8b4378b36893969a6b9a68985de5b 100644
--- a/chrome/browser/sync/sessions/session_state.h
+++ b/chrome/browser/sync/sessions/session_state.h
@@ -28,6 +28,8 @@
#include "chrome/browser/sync/syncable/model_type_payload_map.h"
#include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/engine/syncer_proto_util.h"
+
namespace base {
class DictionaryValue;
}
@@ -109,7 +111,7 @@ struct ErrorCounters {
int consecutive_errors;
// Any protocol errors that we received during this sync session.
- SyncProtocolError sync_protocol_error;
+ SyncOperationResult sync_protocol_error; // FIXME: umm... really? Is this used?
};
// Caller takes ownership of the returned dictionary.
@@ -322,6 +324,12 @@ struct AllModelTypeState {
// requested_update_types stores the set of types which were requested.
syncable::ModelTypeBitSet updates_request_types;
ClientToServerResponse updates_response;
+
+ // FIXME: move these to error counters?
+ SyncOperationResult last_download_updates_result;
+ SyncOperationResult last_post_commit_result;
+ SyncOperationResult last_clear_data_result;
+
// Used to build the shared commit message.
DirtyOnWrite<std::vector<int64> > unsynced_handles;
DirtyOnWrite<SyncerStatus> syncer_status;
« no previous file with comments | « chrome/browser/sync/protocol/sync_protocol_error.cc ('k') | chrome/browser/sync/sessions/status_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698