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

Unified Diff: chrome/browser/sync/engine/all_status.cc

Issue 211019: Fix compiling of sync on linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/sync/engine/auth_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/all_status.cc
===================================================================
--- chrome/browser/sync/engine/all_status.cc (revision 26817)
+++ chrome/browser/sync/engine/all_status.cc (working copy)
@@ -30,8 +30,8 @@
const char* AllStatus::GetSyncStatusString(SyncStatus icon) {
const char* strings[] = {"OFFLINE", "OFFLINE_UNSYNCED", "SYNCING", "READY",
"CONFLICT", "OFFLINE_UNUSABLE"};
- COMPILE_ASSERT(ARRAYSIZE(strings) == ICON_STATUS_COUNT, enum_indexed_array);
- if (icon < 0 || icon >= ARRAYSIZE(strings))
+ COMPILE_ASSERT(arraysize(strings) == ICON_STATUS_COUNT, enum_indexed_array);
+ if (icon < 0 || icon >= static_cast<SyncStatus>(arraysize(strings)))
LOG(FATAL) << "Illegal Icon State:" << icon;
return strings[icon];
}
@@ -42,8 +42,8 @@
static const AllStatusEvent shutdown_event =
{ AllStatusEvent::SHUTDOWN, init_status };
-AllStatus::AllStatus() : channel_(new Channel(shutdown_event)),
- status_(init_status) {
+AllStatus::AllStatus() : status_(init_status),
+ channel_(new Channel(shutdown_event)) {
status_.initial_sync_ended = true;
status_.notifications_enabled = false;
}
« no previous file with comments | « no previous file | chrome/browser/sync/engine/auth_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698