| Index: chrome/browser/system_monitor/removable_device_notifications_linux.cc
|
| diff --git a/chrome/browser/system_monitor/removable_device_notifications_linux.cc b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
|
| index ac899feb1a33f9e04f435bd1cbf4963a80736c0a..c16f4554556953e897782937de8886f5acf68303 100644
|
| --- a/chrome/browser/system_monitor/removable_device_notifications_linux.cc
|
| +++ b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
|
| @@ -18,7 +18,6 @@
|
| #include "base/stl_util.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_util.h"
|
| -#include "base/system_monitor/system_monitor.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
|
| #include "chrome/browser/system_monitor/media_storage_util.h"
|
| @@ -267,7 +266,7 @@ void RemovableDeviceNotificationsLinux::Init() {
|
|
|
| bool RemovableDeviceNotificationsLinux::GetDeviceInfoForPath(
|
| const FilePath& path,
|
| - base::SystemMonitor::RemovableStorageInfo* device_info) const {
|
| + StorageInfo* device_info) const {
|
| if (!path.IsAbsolute())
|
| return false;
|
|
|
| @@ -361,8 +360,7 @@ void RemovableDeviceNotificationsLinux::UpdateMtab() {
|
| if (MediaStorageUtil::IsRemovableDevice(old_iter->second.device_id)) {
|
| DCHECK(has_priority != priority->second.end());
|
| if (has_priority->second) {
|
| - base::SystemMonitor::Get()->ProcessRemovableStorageDetached(
|
| - old_iter->second.device_id);
|
| + ProcessDetach(old_iter->second.device_id);
|
| }
|
| if (priority->second.size() > 1)
|
| multiple_mounted_devices_needing_reattachment.push_back(mount_device);
|
| @@ -398,7 +396,7 @@ void RemovableDeviceNotificationsLinux::UpdateMtab() {
|
| const MountPointInfo& mount_info =
|
| mount_info_map_.find(mount_point)->second;
|
| DCHECK(MediaStorageUtil::IsRemovableDevice(mount_info.device_id));
|
| - base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
|
| + ProcessAttach(
|
| mount_info.device_id, mount_info.device_name, mount_point.value());
|
| }
|
|
|
| @@ -464,7 +462,7 @@ void RemovableDeviceNotificationsLinux::AddNewMount(
|
| mount_priority_map_[mount_device][mount_point] = removable;
|
|
|
| if (removable) {
|
| - base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
|
| + ProcessAttach(
|
| device_id, GetDisplayNameForDevice(partition_size_in_bytes, name),
|
| mount_point.value());
|
| }
|
|
|