| Index: chrome/browser/system_monitor/volume_mount_watcher_win.cc
|
| diff --git a/chrome/browser/system_monitor/volume_mount_watcher_win.cc b/chrome/browser/system_monitor/volume_mount_watcher_win.cc
|
| index c17d227221e2b3f6da81d3b4ea105ba37266335d..7c0573cbfcd20091de1c946eed1aa93eaf3b7055 100644
|
| --- a/chrome/browser/system_monitor/volume_mount_watcher_win.cc
|
| +++ b/chrome/browser/system_monitor/volume_mount_watcher_win.cc
|
| @@ -13,9 +13,9 @@
|
| #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"
|
| +#include "chrome/browser/system_monitor/removable_storage_notifications.h"
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| -using base::SystemMonitor;
|
| using content::BrowserThread;
|
|
|
| namespace {
|
| @@ -242,11 +242,11 @@ void VolumeMountWatcherWin::HandleDeviceAttachEventOnUIThread(
|
| info.device_id = device_id;
|
| device_metadata_[device_path.value()] = info;
|
|
|
| - SystemMonitor* monitor = SystemMonitor::Get();
|
| - if (monitor) {
|
| + RemovableStorageNotifications* notifications =
|
| + RemovableStorageNotifications::GetInstance();
|
| + if (notifications) {
|
| string16 display_name = GetDisplayNameForDevice(0, device_name);
|
| - monitor->ProcessRemovableStorageAttached(device_id, display_name,
|
| - device_path.value());
|
| + notifications->ProcessAttach(device_id, display_name, device_path.value());
|
| }
|
| }
|
|
|
| @@ -259,9 +259,10 @@ void VolumeMountWatcherWin::HandleDeviceDetachEventOnUIThread(
|
| if (device_info == device_metadata_.end())
|
| return;
|
|
|
| - SystemMonitor* monitor = SystemMonitor::Get();
|
| - if (monitor)
|
| - monitor->ProcessRemovableStorageDetached(device_info->second.device_id);
|
| + RemovableStorageNotifications* notifications =
|
| + RemovableStorageNotifications::GetInstance();
|
| + if (notifications)
|
| + notifications->ProcessDetach(device_info->second.device_id);
|
| device_metadata_.erase(device_info);
|
| }
|
|
|
|
|