| Index: chrome/browser/system_monitor/media_storage_util.cc
|
| diff --git a/chrome/browser/system_monitor/media_storage_util.cc b/chrome/browser/system_monitor/media_storage_util.cc
|
| index c6a03ed6c1b057450d8aa2ff3bc0b9c237412a72..be5138a7bffa09218ef1141c48034c88274a13a9 100644
|
| --- a/chrome/browser/system_monitor/media_storage_util.cc
|
| +++ b/chrome/browser/system_monitor/media_storage_util.cc
|
| @@ -87,7 +87,7 @@ void FilterAttachedDevicesOnFileThread(MediaStorageUtil::DeviceIdSet* devices) {
|
| DCHECK(type == MediaStorageUtil::MTP_OR_PTP ||
|
| type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM ||
|
| type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM);
|
| - if (!FindRemovableStorageLocationById(*it).empty())
|
| + if (FindRemovableStorageLocationById(*it).empty())
|
| missing_devices.insert(*it);
|
| }
|
|
|
| @@ -221,13 +221,13 @@ bool MediaStorageUtil::GetDeviceInfoFromPath(const FilePath& path,
|
|
|
| bool found_device = false;
|
| base::SystemMonitor::RemovableStorageInfo device_info;
|
| -#if (defined(OS_LINUX) || defined(OS_MACOSX)) && !defined(OS_CHROMEOS)
|
| +#if (defined(OS_LINUX) || defined(OS_MACOSX))
|
| RemovableDeviceNotifications* notifier =
|
| RemovableDeviceNotifications::GetInstance();
|
| found_device = notifier->GetDeviceInfoForPath(path, &device_info);
|
| #endif
|
|
|
| -#if 0 && defined(OS_CHROMEOS)
|
| +#if defined(OS_CHROMEOS)
|
| if (!found_device) {
|
| MediaTransferProtocolDeviceObserver* mtp_manager =
|
| MediaTransferProtocolDeviceObserver::GetInstance();
|
|
|