diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 17:28:51 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 17:28:51 +0000 |
| commit | 6b7e090e931edb1cb31a53ca9852ffd0ba3ee7ea (patch) | |
| tree | 0ab47a5ab73676dab43bd0b4cc17e88855ac6eda /chrome/browser | |
| parent | 1fdfce6867010e31e52198e996ab0d05703dacf5 (diff) | |
| download | chromium_src-6b7e090e931edb1cb31a53ca9852ffd0ba3ee7ea.zip chromium_src-6b7e090e931edb1cb31a53ca9852ffd0ba3ee7ea.tar.gz chromium_src-6b7e090e931edb1cb31a53ca9852ffd0ba3ee7ea.tar.bz2 | |
Check in syncapi header consistent with most recent build of syncapi.dll
from the chrome sync client devchannel release branch.
TBR=idana
Review URL: http://codereview.chromium.org/196124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h index 770581a9..b922318 100644 --- a/chrome/browser/sync/engine/syncapi.h +++ b/chrome/browser/sync/engine/syncapi.h @@ -409,6 +409,8 @@ class SYNC_EXPORT SyncManager { SYNCING, // Connected, no pending changes. READY, + // User has chosen to pause syncing. + PAUSED, // Internal sync error. CONFLICT, // Can't connect to server, and we haven't completed the initial @@ -433,6 +435,7 @@ class SYNC_EXPORT SyncManager { int unsynced_count; int conflicting_count; bool syncing; + bool syncer_paused; bool initial_sync_ended; bool syncer_stuck; int64 updates_available; |