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

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: Fix sync_unit_test failure 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 1a095291f3016cde0e8539a20f8df8f1e0af1c00..aa61cffcdf7af019805fd5e8c884c74a3417007e 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1016,7 +1016,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);
« no previous file with comments | « chrome/browser/sync/internal_api/sync_manager.cc ('k') | chrome/browser/sync/protocol/client_debug_info.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698