| Index: chrome/browser/chromeos/file_manager/mounted_disk_monitor.h
|
| diff --git a/chrome/browser/chromeos/file_manager/mounted_disk_monitor.h b/chrome/browser/chromeos/file_manager/mounted_disk_monitor.h
|
| index 403f7dfa977b156634f5b29ad64a797b95294543..ebaac2c36d631aded488c88228b7d2aa7c5e02b3 100644
|
| --- a/chrome/browser/chromeos/file_manager/mounted_disk_monitor.h
|
| +++ b/chrome/browser/chromeos/file_manager/mounted_disk_monitor.h
|
| @@ -21,35 +21,28 @@ namespace file_manager {
|
| // couple of seconds. This is to give DiskManager time to process device
|
| // removed/added events (events for the devices that were present before suspend
|
| // should not trigger any new notifications or file manager windows).
|
| -class MountedDiskMonitor
|
| - : public chromeos::PowerManagerClient::Observer,
|
| - public chromeos::disks::DiskMountManager::Observer {
|
| +class MountedDiskMonitor : public chromeos::PowerManagerClient::Observer {
|
| public:
|
| - MountedDiskMonitor(
|
| - chromeos::PowerManagerClient* power_manager_client,
|
| - chromeos::disks::DiskMountManager* disk_mount_manager);
|
| + explicit MountedDiskMonitor(
|
| + chromeos::PowerManagerClient* power_manager_client);
|
| virtual ~MountedDiskMonitor();
|
|
|
| // PowerManagerClient::Observer overrides:
|
| virtual void SuspendImminent() OVERRIDE;
|
| virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE;
|
|
|
| - // DiskMountManager::Observer overrides.
|
| - virtual void OnDiskEvent(
|
| + // Receives forwarded notifications originates from DiskMountManager.
|
| + void OnDiskEvent(
|
| chromeos::disks::DiskMountManager::DiskEvent event,
|
| - const chromeos::disks::DiskMountManager::Disk* disk) OVERRIDE;
|
| - virtual void OnDeviceEvent(
|
| + const chromeos::disks::DiskMountManager::Disk* disk);
|
| + void OnDeviceEvent(
|
| chromeos::disks::DiskMountManager::DeviceEvent event,
|
| - const std::string& device_path) OVERRIDE;
|
| - virtual void OnMountEvent(
|
| + const std::string& device_path);
|
| + void OnMountEvent(
|
| chromeos::disks::DiskMountManager::MountEvent event,
|
| chromeos::MountError error_code,
|
| - const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
|
| - OVERRIDE;
|
| - virtual void OnFormatEvent(
|
| - chromeos::disks::DiskMountManager::FormatEvent event,
|
| - chromeos::FormatError error_code,
|
| - const std::string& device_path) OVERRIDE;
|
| + const chromeos::disks::DiskMountManager::MountPointInfo& mount_info,
|
| + const chromeos::disks::DiskMountManager::Disk* disk);
|
|
|
| // Checks if the disk is being remounted. The disk is remounting if it has
|
| // been unmounted during the resuming time span.
|
| @@ -77,7 +70,6 @@ class MountedDiskMonitor
|
| void Reset();
|
|
|
| chromeos::PowerManagerClient* power_manager_client_;
|
| - chromeos::disks::DiskMountManager* disk_mount_manager_;
|
|
|
| bool is_resuming_;
|
| DiskMap mounted_disks_;
|
|
|