Index: chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc |
=================================================================== |
--- chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc (revision 218837) |
+++ chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc (working copy) |
@@ -90,18 +90,8 @@ |
media_galleries_private::OnDeviceAttached::kEventName)) |
return; |
- chrome::MediaGalleryPrefInfo pref_info; |
- pref_info.display_name = info.name(); |
- pref_info.device_id = info.device_id(); |
- pref_info.type = chrome::MediaGalleryPrefInfo::kAutoDetected; |
- pref_info.volume_label = info.storage_label(); |
- pref_info.vendor_name = info.vendor_name(); |
- pref_info.model_name = info.model_name(); |
- pref_info.total_size_in_bytes = info.total_size_in_bytes(); |
- pref_info.volume_metadata_valid = true; |
- |
DeviceAttachmentDetails details; |
- details.device_name = UTF16ToUTF8(pref_info.GetGalleryDisplayName()); |
+ details.device_name = base::UTF16ToUTF8(info.GetDisplayName(true)); |
details.device_id = GetTransientIdForDeviceId(info.device_id()); |
scoped_ptr<base::ListValue> args(new base::ListValue()); |