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

Unified Diff: chrome/browser/sync/internal_api/sync_manager.h

Issue 9149017: Remove broken variables from sync's AllStatus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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/internal_api/sync_manager.h
diff --git a/chrome/browser/sync/internal_api/sync_manager.h b/chrome/browser/sync/internal_api/sync_manager.h
index 14ffb6b6deb13b1bba626d9acd90147f45ec13b4..28e86c56cd52c9773eecae247dea6bfb1e1aa9a9 100644
--- a/chrome/browser/sync/internal_api/sync_manager.h
+++ b/chrome/browser/sync/internal_api/sync_manager.h
@@ -100,8 +100,6 @@ class SyncManager {
SYNCING,
// Connected, no pending changes.
READY,
- // Internal sync error.
- CONFLICT,
// Can't connect to server, and we haven't completed the initial
// sync yet. So there's nothing we can do but wait for the server.
OFFLINE_UNUSABLE,
@@ -117,8 +115,6 @@ class SyncManager {
bool server_up; // True if we have received at least one good
// reply from the server.
bool server_reachable; // True if we received any reply from the server.
- bool server_broken; // True of the syncer is stopped because of server
- // issues.
bool notifications_enabled; // True only if subscribed for notifications.
// Notifications counters updated by the actions in synapi.
@@ -130,14 +126,15 @@ class SyncManager {
browser_sync::SyncProtocolError sync_protocol_error;
+ // Number of unsynced items counted at the start of most recent sync cycle.
int unsynced_count;
+ // Number of conflicting items counted during most recent sync cycle.
int conflicting_count;
+
bool syncing;
// True after a client has done a first sync.
bool initial_sync_ended;
- // True if any syncer is stuck.
- bool syncer_stuck;
// Total updates available. If zero, nothing left to download.
int64 updates_available;
@@ -146,7 +143,6 @@ class SyncManager {
// Of updates_received, how many were tombstones.
int tombstone_updates_received;
- bool disk_full;
// Total number of overwrites due to conflict resolver since browser start.
int num_local_overwrites_total;

Powered by Google App Engine
This is Rietveld 408576698