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

Unified Diff: chrome/browser/media_galleries/media_file_system_registry.cc

Issue 15988011: Refine StorageMonitor storage device getter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 6 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/media_galleries/media_file_system_registry.cc
diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc
index 42ecc918809c726959db87beab5a627d66ddf5ef..55a88882618c80d52859d6e99268f04d975ac6b8 100644
--- a/chrome/browser/media_galleries/media_file_system_registry.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry.cc
@@ -466,9 +466,11 @@ MediaGalleriesPreferences* MediaFileSystemRegistry::GetPreferences(
// TODO(gbillock): Move this stanza to MediaGalleriesPreferences init code.
StorageMonitor* monitor = StorageMonitor::GetInstance();
DCHECK(monitor->IsInitialized());
- std::vector<StorageInfo> existing_devices = monitor->GetAttachedStorage();
+ std::vector<StorageInfo> existing_devices =
+ monitor->GetAllAvailableStorages();
for (size_t i = 0; i < existing_devices.size(); i++) {
- if (!StorageInfo::IsMediaDevice(existing_devices[i].device_id()))
+ if (!(StorageInfo::IsMediaDevice(existing_devices[i].device_id()) &&
+ StorageInfo::IsRemovableDevice(existing_devices[i].device_id())))
continue;
if (!existing_devices[i].name().empty()) {
preferences->AddGalleryWithName(existing_devices[i].device_id(),

Powered by Google App Engine
This is Rietveld 408576698