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

Unified Diff: chrome/browser/chromeos/file_manager/mounted_disk_monitor.h

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
« no previous file with comments | « no previous file | chrome/browser/chromeos/file_manager/mounted_disk_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/file_manager/mounted_disk_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698