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

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

Issue 12211084: [Media Galleries] Populate volume metadata in ChromeOS/Linux (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 10 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/media_transfer_protocol_device_observer_linux.cc
diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc
index 490d9ed6ead2a4bf5be62dba3568082569795f50..96f9e440832a65233b28fd2bc94be91df822376f 100644
--- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc
+++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc
@@ -113,7 +113,6 @@ void GetStorageInfo(const std::string& storage_name,
if (label)
*label = GetDeviceLabelFromStorageInfo(*storage_info);
-
if (location)
*location = GetDeviceLocationFromStorageName(storage_name);
}
@@ -214,8 +213,9 @@ void MediaTransferProtocolDeviceObserverLinux::StorageChanged(
RemovableStorageNotifications::StorageInfo storage_info(
device_id, device_name, location);
+ storage_info.storage_label = device_name;
storage_map_[location] = storage_info;
- notifications_->ProcessAttach(device_id, device_name, location);
+ notifications_->ProcessAttach(storage_info);
} else {
// Existing storage is detached.
StorageLocationToInfoMap::iterator it =

Powered by Google App Engine
This is Rietveld 408576698