Index: chrome/browser/media_gallery/media_file_system_registry.cc |
=================================================================== |
--- chrome/browser/media_gallery/media_file_system_registry.cc (revision 172539) |
+++ chrome/browser/media_gallery/media_file_system_registry.cc (working copy) |
@@ -333,6 +333,9 @@ |
if (!transient_device_id.empty()) |
dict_value.SetStringWithoutPathExpansion("deviceId", transient_device_id); |
+ dict_value.SetBooleanWithoutPathExpansion( |
+ "isRemovable", MediaStorageUtil::IsRemovableDevice(device_id)); |
kmadhusu
2012/12/12 17:45:02
I am not sure why we need a new key value pair to
Lei Zhang
2012/12/12 20:15:15
That's a good point. We can discuss this on the bu
|
+ |
std::string json_string; |
base::JSONWriter::Write(&dict_value, &json_string); |
return json_string; |
@@ -699,10 +702,13 @@ |
mtp_device_delegate_map_.find(device_location); |
if (delegate_it != mtp_device_delegate_map_.end()) |
return delegate_it->second; |
- ScopedMTPDeviceMapEntry* mtp_device_host = new ScopedMTPDeviceMapEntry( |
- device_location, base::Bind( |
- &MediaFileSystemRegistry::RemoveScopedMTPDeviceMapEntry, |
- base::Unretained(this), device_location)); |
+ ScopedMTPDeviceMapEntry* mtp_device_host = |
+ new ScopedMTPDeviceMapEntry( |
+ device_location, |
+ base::Bind( |
+ &MediaFileSystemRegistry::RemoveScopedMTPDeviceMapEntry, |
+ base::Unretained(this), |
+ device_location)); |
mtp_device_delegate_map_[device_location] = mtp_device_host; |
return mtp_device_host; |
} |