| Index: chrome/browser/system_monitor/removable_device_notifications_chromeos.cc
|
| diff --git a/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc b/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc
|
| index 356f704cc175cb4928a9f94e5d0abd811d707c52..dea060b7da24f248effe07b5f75c18d6c9e7feb6 100644
|
| --- a/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc
|
| +++ b/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc
|
| @@ -19,8 +19,6 @@
|
|
|
| namespace chromeos {
|
|
|
| -using base::SystemMonitor;
|
| -
|
| namespace {
|
|
|
| // Constructs a device name using label or manufacturer (vendor and product)
|
| @@ -165,8 +163,7 @@ void RemovableDeviceNotificationsCros::OnMountEvent(
|
| MountMap::iterator it = mount_map_.find(mount_info.mount_path);
|
| if (it == mount_map_.end())
|
| return;
|
| - SystemMonitor::Get()->ProcessRemovableStorageDetached(
|
| - it->second.storage_info.device_id);
|
| + ProcessDetach(it->second.storage_info.device_id);
|
| mount_map_.erase(it);
|
| break;
|
| }
|
| @@ -181,7 +178,7 @@ void RemovableDeviceNotificationsCros::OnFormatEvent(
|
|
|
| bool RemovableDeviceNotificationsCros::GetDeviceInfoForPath(
|
| const FilePath& path,
|
| - SystemMonitor::RemovableStorageInfo* device_info) const {
|
| + StorageInfo* device_info) const {
|
| if (!path.IsAbsolute())
|
| return false;
|
|
|
| @@ -252,12 +249,11 @@ void RemovableDeviceNotificationsCros::AddMountedPathOnUIThread(
|
| std::string device_id = chrome::MediaStorageUtil::MakeDeviceId(type,
|
| unique_id);
|
| StorageObjectInfo object_info = {
|
| - base::SystemMonitor::RemovableStorageInfo(device_id, device_label,
|
| - mount_info.mount_path),
|
| + StorageInfo(device_id, device_label, mount_info.mount_path),
|
| storage_size_in_bytes
|
| };
|
| mount_map_.insert(std::make_pair(mount_info.mount_path, object_info));
|
| - SystemMonitor::Get()->ProcessRemovableStorageAttached(
|
| + ProcessAttach(
|
| device_id,
|
| chrome::GetDisplayNameForDevice(storage_size_in_bytes, device_label),
|
| mount_info.mount_path);
|
|
|