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

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

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/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index d6a4d8d6ddd5b5f7e336be2f2171008a68f2ef12..692017bcd6075bdeffd17a98801235e8c0a95f57 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1009,7 +1009,7 @@ bool ProfileSyncService::SetupInProgress() const {
std::string ProfileSyncService::BuildSyncStatusSummaryText(
const sync_api::SyncManager::Status::Summary& summary) {
const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING",
- "READY", "CONFLICT", "OFFLINE_UNUSABLE"};
+ "READY", "OFFLINE_UNUSABLE"};
COMPILE_ASSERT(arraysize(strings) ==
sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT,
enum_indexed_array);

Powered by Google App Engine
This is Rietveld 408576698