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

Unified Diff: chrome/browser/system_monitor/removable_device_notifications_window_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: Merge to head 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
Index: chrome/browser/system_monitor/removable_device_notifications_window_win.cc
diff --git a/chrome/browser/system_monitor/removable_device_notifications_window_win.cc b/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
index 210a672df96f2b1702f8d29b02cbc2f17d7ac38a..998ddc7c69c1cfc89087b0c19e4b1b0b7a4b4acf 100644
--- a/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
@@ -83,7 +83,7 @@ void RemovableDeviceNotificationsWindowWin::Init() {
bool RemovableDeviceNotificationsWindowWin::GetDeviceInfoForPath(
const FilePath& path,
- base::SystemMonitor::RemovableStorageInfo* device_info) const {
+ StorageInfo* device_info) const {
string16 location;
std::string unique_id;
string16 name;
@@ -94,11 +94,10 @@ bool RemovableDeviceNotificationsWindowWin::GetDeviceInfoForPath(
// To compute the device id, the device type is needed. For removable
// devices, that requires knowing if there's a DCIM directory, which would
// require bouncing over to the file thread. Instead, just iterate the
- // devices in base::SystemMonitor.
+ // devices.
std::string device_id;
if (removable) {
- std::vector<base::SystemMonitor::RemovableStorageInfo> attached_devices =
- base::SystemMonitor::Get()->GetAttachedRemovableStorage();
+ std::vector<StorageInfo> attached_devices = GetAttachedStorage();
bool found = false;
for (size_t i = 0; i < attached_devices.size(); i++) {
MediaStorageUtil::Type type;

Powered by Google App Engine
This is Rietveld 408576698