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

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

Issue 10911234: Update Windows System Monitor Removable Device Impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
Index: chrome/browser/system_monitor/removable_device_notifications_linux.cc
diff --git a/chrome/browser/system_monitor/removable_device_notifications_linux.cc b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
index e474b36dc396287f109ed05ab41706f4a9630b8f..2d484dc9d7721c2a47e4dc6393829fe7e89b313d 100644
--- a/chrome/browser/system_monitor/removable_device_notifications_linux.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
@@ -278,41 +278,6 @@ void RemovableDeviceNotificationsLinux::Init() {
base::Bind(&RemovableDeviceNotificationsLinux::InitOnFileThread, this));
}
-FilePath RemovableDeviceNotificationsLinux::GetDeviceMountPoint(
- const std::string& device_id) const {
-
- MediaStorageUtil::Type type;
- MediaStorageUtil::CrackDeviceId(device_id, &type, NULL);
- if (type == MediaStorageUtil::MTP_OR_PTP)
- return FilePath();
- DCHECK(type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM ||
- type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM ||
- type == MediaStorageUtil::FIXED_MASS_STORAGE);
-
- FilePath mount_device;
- for (MountMap::const_iterator it = mount_info_map_.begin();
- it != mount_info_map_.end();
- ++it) {
- if (it->second.device_id == device_id) {
- mount_device = it->second.mount_device;
- break;
- }
- }
- if (mount_device.empty())
- return mount_device;
-
- const ReferencedMountPoint& referenced_info =
- mount_priority_map_.find(mount_device)->second;
- for (ReferencedMountPoint::const_iterator it = referenced_info.begin();
- it != referenced_info.end();
- ++it) {
- if (it->second)
- return it->first;
- }
- // If none of them are default, just return the first.
- return FilePath(referenced_info.begin()->first);
-}
-
bool RemovableDeviceNotificationsLinux::GetDeviceInfoForPath(
const FilePath& path,
SystemMonitor::RemovableStorageInfo* device_info) const {

Powered by Google App Engine
This is Rietveld 408576698