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

Unified Diff: chrome/browser/system_monitor/volume_mount_watcher_win.cc

Issue 11573048: [Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Working on windows Created 7 years, 11 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 | « chrome/browser/system_monitor/volume_mount_watcher_win.h ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 953fcbe897391455598e2346a343857773043fcc..8653499038028cdf7ac3c5775298b2df7dfb082c 100644
--- a/chrome/browser/system_monitor/volume_mount_watcher_win.cc
+++ b/chrome/browser/system_monitor/volume_mount_watcher_win.cc
@@ -14,9 +14,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 {
@@ -319,11 +319,12 @@ void VolumeMountWatcherWin::HandleDeviceAttachEventOnUIThread(
if (!info.removable)
return;
- SystemMonitor* monitor = SystemMonitor::Get();
- if (monitor) {
+ RemovableStorageNotifications* notifications =
+ RemovableStorageNotifications::GetInstance();
+ if (notifications) {
string16 display_name = GetDisplayNameForDevice(0, info.name);
- monitor->ProcessRemovableStorageAttached(info.device_id, display_name,
- device_path.value());
+ notifications->ProcessAttach(info.device_id, display_name,
+ device_path.value());
}
}
@@ -337,9 +338,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);
}
« no previous file with comments | « chrome/browser/system_monitor/volume_mount_watcher_win.h ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698