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

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

Issue 10918259: [Chrome OS]Implement MediaStorageUtil::GetDeviceInfoForPath function to support media gallery permi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win compile error Created 8 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/system_monitor/media_transfer_protocol_device_observer_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ce808d4821bf6bf1ac054b405cc13c9aab476ce8..94969b65b4987671808e55104da8223754699537 100644
--- a/chrome/browser/system_monitor/media_storage_util.cc
+++ b/chrome/browser/system_monitor/media_storage_util.cc
@@ -101,7 +101,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);
}
@@ -235,16 +235,16 @@ 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();
+ chromeos::mtp::MediaTransferProtocolDeviceObserverCros* mtp_manager =
+ chromeos::mtp::MediaTransferProtocolDeviceObserverCros::GetInstance();
found_device = mtp_manager->GetStorageInfoForPath(path, &device_info);
}
#endif
« no previous file with comments | « no previous file | chrome/browser/system_monitor/media_transfer_protocol_device_observer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698