| Index: chrome/browser/chromeos/file_manager/volume_manager.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| index 86b788ff4f338e4753d20ce56da0361d25823f4e..e2274225166fd9456d81a893f96ae44046620158 100644
|
| --- a/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| +++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| @@ -44,7 +44,7 @@ namespace {
|
| const uint32_t kAccessCapabilityReadWrite = 0;
|
| const uint32_t kFilesystemTypeGenericHierarchical = 2;
|
| const char kFileManagerMTPMountNamePrefix[] = "fileman-mtp-";
|
| -const char kMtpVolumeIdPrefix [] = "mtp:";
|
| +const char kMtpVolumeIdPrefix[] = "mtp:";
|
| const char kRootPath[] = "/";
|
|
|
| // Registers |path| as the "Downloads" folder to the FileSystem API backend.
|
| @@ -508,8 +508,8 @@ void VolumeManager::OnDiskEvent(
|
| }
|
|
|
| // Notify to observers.
|
| - FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
|
| - OnDiskAdded(*disk, mounting));
|
| + for (auto& observer : observers_)
|
| + observer.OnDiskAdded(*disk, mounting);
|
| return;
|
| }
|
|
|
| @@ -523,8 +523,8 @@ void VolumeManager::OnDiskEvent(
|
| }
|
|
|
| // Notify to observers.
|
| - FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
|
| - OnDiskRemoved(*disk));
|
| + for (auto& observer : observers_)
|
| + observer.OnDiskRemoved(*disk);
|
| return;
|
| }
|
| NOTREACHED();
|
| @@ -538,12 +538,12 @@ void VolumeManager::OnDeviceEvent(
|
| DVLOG(1) << "OnDeviceEvent: " << event << ", " << device_path;
|
| switch (event) {
|
| case chromeos::disks::DiskMountManager::DEVICE_ADDED:
|
| - FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
|
| - OnDeviceAdded(device_path));
|
| + for (auto& observer : observers_)
|
| + observer.OnDeviceAdded(device_path);
|
| return;
|
| case chromeos::disks::DiskMountManager::DEVICE_REMOVED: {
|
| - FOR_EACH_OBSERVER(
|
| - VolumeManagerObserver, observers_, OnDeviceRemoved(device_path));
|
| + for (auto& observer : observers_)
|
| + observer.OnDeviceRemoved(device_path);
|
| return;
|
| }
|
| case chromeos::disks::DiskMountManager::DEVICE_SCANNED:
|
| @@ -605,10 +605,10 @@ void VolumeManager::OnFormatEvent(
|
|
|
| switch (event) {
|
| case chromeos::disks::DiskMountManager::FORMAT_STARTED:
|
| - FOR_EACH_OBSERVER(
|
| - VolumeManagerObserver, observers_,
|
| - OnFormatStarted(device_path,
|
| - error_code == chromeos::FORMAT_ERROR_NONE));
|
| + for (auto& observer : observers_) {
|
| + observer.OnFormatStarted(device_path,
|
| + error_code == chromeos::FORMAT_ERROR_NONE);
|
| + }
|
| return;
|
| case chromeos::disks::DiskMountManager::FORMAT_COMPLETED:
|
| if (error_code == chromeos::FORMAT_ERROR_NONE) {
|
| @@ -622,10 +622,10 @@ void VolumeManager::OnFormatEvent(
|
| GetExternalStorageAccessMode(profile_));
|
| }
|
|
|
| - FOR_EACH_OBSERVER(
|
| - VolumeManagerObserver, observers_,
|
| - OnFormatCompleted(device_path,
|
| - error_code == chromeos::FORMAT_ERROR_NONE));
|
| + for (auto& observer : observers_) {
|
| + observer.OnFormatCompleted(device_path,
|
| + error_code == chromeos::FORMAT_ERROR_NONE);
|
| + }
|
|
|
| return;
|
| }
|
| @@ -893,8 +893,8 @@ void VolumeManager::DoMountEvent(chromeos::MountError error_code,
|
| NUM_VOLUME_TYPE);
|
| }
|
|
|
| - FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
|
| - OnVolumeMounted(error_code, *volume));
|
| + for (auto& observer : observers_)
|
| + observer.OnVolumeMounted(error_code, *volume);
|
| }
|
|
|
| void VolumeManager::DoUnmountEvent(chromeos::MountError error_code,
|
| @@ -904,8 +904,8 @@ void VolumeManager::DoUnmountEvent(chromeos::MountError error_code,
|
| if (error_code == chromeos::MOUNT_ERROR_NONE)
|
| mounted_volumes_.erase(volume->volume_id());
|
|
|
| - FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
|
| - OnVolumeUnmounted(error_code, *volume.get()));
|
| + for (auto& observer : observers_)
|
| + observer.OnVolumeUnmounted(error_code, *volume.get());
|
| }
|
|
|
| } // namespace file_manager
|
|
|