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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 6104003: sync: use progress markers instead of timestamps during GetUpdates (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tim's fixes Created 9 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/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 852ed4ba12410c1d54be001908df2c6c35720d29..6fb4a50eda5e21cfcd43c99665a90122a42c35e4 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -780,24 +780,18 @@ bool ProfileSyncService::SetupInProgress() const {
}
std::string ProfileSyncService::BuildSyncStatusSummaryText(
- const sync_api::SyncManager::Status::Summary& summary) {
- switch (summary) {
- case sync_api::SyncManager::Status::OFFLINE:
- return "OFFLINE";
- case sync_api::SyncManager::Status::OFFLINE_UNSYNCED:
- return "OFFLINE_UNSYNCED";
- case sync_api::SyncManager::Status::SYNCING:
- return "SYNCING";
- case sync_api::SyncManager::Status::READY:
- return "READY";
- case sync_api::SyncManager::Status::CONFLICT:
- return "CONFLICT";
- case sync_api::SyncManager::Status::OFFLINE_UNUSABLE:
- return "OFFLINE_UNUSABLE";
- case sync_api::SyncManager::Status::INVALID: // fall through
- default:
- return "UNKNOWN";
+ const sync_api::SyncManager::Status::Summary& summary) {
+ const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING",
+ "READY", "CONFLICT", "OFFLINE_UNUSABLE"};
+ COMPILE_ASSERT(arraysize(strings) ==
+ sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT,
+ enum_indexed_array);
+ if (summary < 0 ||
+ summary >= sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT) {
+ LOG(DFATAL) << "Illegal Summary Value: " << summary;
+ return "UNKNOWN";
}
+ return strings[summary];
}
bool ProfileSyncService::unrecoverable_error_detected() const {
« no previous file with comments | « chrome/browser/sync/engine/verify_updates_command.cc ('k') | chrome/browser/sync/profile_sync_service_harness.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698