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

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager.cc

Issue 372853003: Cut reference from MountedDiskMonitor to DiskMountManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix more test Created 6 years, 5 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/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 733d00f8ffe2728135f0b35a4cfbbccbee99087d..44006540dbe3c0a15e57a10bad0f5be441e4f2da 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -254,8 +254,7 @@ VolumeManager::VolumeManager(
: profile_(profile),
drive_integration_service_(drive_integration_service),
disk_mount_manager_(disk_mount_manager),
- mounted_disk_monitor_(
- new MountedDiskMonitor(power_manager_client, disk_mount_manager)),
+ mounted_disk_monitor_(new MountedDiskMonitor(power_manager_client)),
file_system_provider_service_(file_system_provider_service),
snapshot_manager_(new SnapshotManager(profile_)),
weak_ptr_factory_(this) {
@@ -505,6 +504,8 @@ void VolumeManager::OnDiskEvent(
const chromeos::disks::DiskMountManager::Disk* disk) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ mounted_disk_monitor_->OnDiskEvent(event, disk);
+
// Disregard hidden devices.
if (disk->is_hidden())
return;
@@ -565,8 +566,10 @@ void VolumeManager::OnDeviceEvent(
chromeos::disks::DiskMountManager::DeviceEvent event,
const std::string& device_path) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- DVLOG(1) << "OnDeviceEvent: " << event << ", " << device_path;
+ mounted_disk_monitor_->OnDeviceEvent(event, device_path);
+
+ DVLOG(1) << "OnDeviceEvent: " << event << ", " << device_path;
switch (event) {
case chromeos::disks::DiskMountManager::DEVICE_ADDED:
FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
@@ -591,6 +594,10 @@ void VolumeManager::OnMountEvent(
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK_NE(chromeos::MOUNT_TYPE_INVALID, mount_info.mount_type);
+ const chromeos::disks::DiskMountManager::Disk* disk =
+ disk_mount_manager_->FindDiskBySourcePath(mount_info.source_path);
+ mounted_disk_monitor_->OnMountEvent(event, error_code, mount_info, disk);
+
if (mount_info.mount_type == chromeos::MOUNT_TYPE_ARCHIVE) {
// If the file is not mounted now, tell it to drive file system so that
// it can handle file caching correctly.
@@ -611,8 +618,6 @@ void VolumeManager::OnMountEvent(
}
// Notify a mounting/unmounting event to observers.
- const chromeos::disks::DiskMountManager::Disk* disk =
- disk_mount_manager_->FindDiskBySourcePath(mount_info.source_path);
VolumeInfo volume_info =
CreateVolumeInfoFromMountPointInfo(mount_info, disk);
switch (event) {

Powered by Google App Engine
This is Rietveld 408576698