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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_worker.cc

Issue 2425553002: Remove FOR_EACH_OBSERVER macro usage in chrome/browser/sync_file_system (Closed)
Patch Set: Created 4 years, 2 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_file_system/drive_backend/sync_worker.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
index c97826b6a21398167d8e988a87f2ac6d80c70208..ab007c416555adeebaf5a7403273b53821b42f4b 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
@@ -216,12 +216,10 @@ void SyncWorker::SetSyncEnabled(bool enabled) {
if (old_state == GetCurrentState())
return;
- FOR_EACH_OBSERVER(
- Observer,
- observers_,
- UpdateServiceState(
- GetCurrentState(),
- enabled ? "Sync is enabled" : "Sync is disabled"));
+ for (auto& observer : observers_) {
+ observer.UpdateServiceState(
+ GetCurrentState(), enabled ? "Sync is enabled" : "Sync is disabled");
+ }
}
void SyncWorker::PromoteDemotedChanges(const base::Closure& callback) {
@@ -230,10 +228,8 @@ void SyncWorker::PromoteDemotedChanges(const base::Closure& callback) {
MetadataDatabase* metadata_db = GetMetadataDatabase();
if (metadata_db && metadata_db->HasDemotedDirtyTracker()) {
metadata_db->PromoteDemotedTrackers();
- FOR_EACH_OBSERVER(
- Observer,
- observers_,
- OnPendingFileListUpdated(metadata_db->CountDirtyTracker()));
+ for (auto& observer : observers_)
+ observer.OnPendingFileListUpdated(metadata_db->CountDirtyTracker());
}
callback.Run();
}
@@ -282,9 +278,10 @@ void SyncWorker::NotifyLastOperationStatus(
UpdateServiceStateFromSyncStatusCode(status, used_network);
if (GetMetadataDatabase()) {
- FOR_EACH_OBSERVER(
- Observer, observers_,
- OnPendingFileListUpdated(GetMetadataDatabase()->CountDirtyTracker()));
+ for (auto& observer : observers_) {
+ observer.OnPendingFileListUpdated(
+ GetMetadataDatabase()->CountDirtyTracker());
+ }
}
}
@@ -500,14 +497,11 @@ void SyncWorker::DidProcessRemoteChange(RemoteToLocalSyncer* syncer,
if (status == SYNC_STATUS_OK) {
if (syncer->sync_action() != SYNC_ACTION_NONE &&
syncer->url().is_valid()) {
- FOR_EACH_OBSERVER(
- Observer, observers_,
- OnFileStatusChanged(
- syncer->url(),
- syncer->file_type(),
- SYNC_FILE_STATUS_SYNCED,
- syncer->sync_action(),
- SYNC_DIRECTION_REMOTE_TO_LOCAL));
+ for (auto& observer : observers_) {
+ observer.OnFileStatusChanged(
+ syncer->url(), syncer->file_type(), SYNC_FILE_STATUS_SYNCED,
+ syncer->sync_action(), SYNC_DIRECTION_REMOTE_TO_LOCAL);
+ }
}
if (syncer->sync_action() == SYNC_ACTION_DELETED &&
@@ -533,12 +527,11 @@ void SyncWorker::DidApplyLocalChange(LocalToRemoteSyncer* syncer,
updated_url = CreateSyncableFileSystemURL(syncer->url().origin(),
syncer->target_path());
}
- FOR_EACH_OBSERVER(Observer, observers_,
- OnFileStatusChanged(updated_url,
- syncer->file_type(),
- SYNC_FILE_STATUS_SYNCED,
- syncer->sync_action(),
- SYNC_DIRECTION_LOCAL_TO_REMOTE));
+ for (auto& observer : observers_) {
+ observer.OnFileStatusChanged(
+ updated_url, syncer->file_type(), SYNC_FILE_STATUS_SYNCED,
+ syncer->sync_action(), SYNC_DIRECTION_LOCAL_TO_REMOTE);
+ }
}
if (status == SYNC_STATUS_UNKNOWN_ORIGIN && syncer->url().is_valid()) {
@@ -680,9 +673,8 @@ void SyncWorker::UpdateServiceState(RemoteServiceState state,
"Service state changed: %d->%d: %s",
old_state, GetCurrentState(), description.c_str());
- FOR_EACH_OBSERVER(
- Observer, observers_,
- UpdateServiceState(GetCurrentState(), description));
+ for (auto& observer : observers_)
+ observer.UpdateServiceState(GetCurrentState(), description);
}
void SyncWorker::CallOnIdleForTesting(const base::Closure& callback) {

Powered by Google App Engine
This is Rietveld 408576698