Linux removable device notifications: notify about non-dcim devices.

chrome/browser/media_gallery/removable_device_notifications_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // RemovableDeviceNotificationsLinux implementation.
 
 #include "chrome/browser/media_gallery/removable_device_notifications_linux.h"
 
 #include <libudev.h>
 #include <mntent.h>
@@ skipping 367 matching lines @@
     const FilePath& mount_device = old_iter->second.mount_device;
     MountPointDeviceMap::iterator new_iter = new_mtab.find(mount_point);
     // |mount_point| not in |new_mtab| or |mount_device| is no longer mounted at
     // |mount_point|.
     if (new_iter == new_mtab.end() || (new_iter->second != mount_device)) {
       MountPriorityMap::iterator priority =
           mount_priority_map_.find(mount_device);
       DCHECK(priority != mount_priority_map_.end());
       ReferencedMountPoint::const_iterator has_priority =
           priority->second.find(mount_point);
-      if (old_iter->second.has_dcim) {
+      if (MediaStorageUtil::IsRemovableDevice(old_iter->second.device_id)) {
         DCHECK(has_priority != priority->second.end());
-        if (has_priority->second)
-          RemoveMediaMount(old_iter->second.device_id);
+        if (has_priority->second) {
+          SystemMonitor::Get()->ProcessRemovableStorageDetached(
+              old_iter->second.device_id);
+        }
         if (priority->second.size() > 1)
           multiple_mounted_devices_needing_reattachment.push_back(mount_device);
       }
       priority->second.erase(mount_point);
       if (priority->second.empty())
         mount_priority_map_.erase(mount_device);
       mount_points_to_erase.push_back(mount_point);
     }
   }
 
@@ skipping 13 matching lines @@
            multiple_mounted_devices_needing_reattachment.begin();
        it != multiple_mounted_devices_needing_reattachment.end();
        ++it) {
     ReferencedMountPoint::iterator first_mount_point_info =
         mount_priority_map_.find(*it)->second.begin();
     const FilePath& mount_point = first_mount_point_info->first;
     first_mount_point_info->second = true;
 
     const MountPointInfo& mount_info =
         mount_info_map_.find(mount_point)->second;
-    DCHECK(mount_info.has_dcim);
+    DCHECK(MediaStorageUtil::IsRemovableDevice(mount_info.device_id));
     base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
         mount_info.device_id, mount_info.device_name, mount_point.value());
   }
 
   // Check new mtab entries against existing ones.
   for (MountPointDeviceMap::iterator new_iter = new_mtab.begin();
        new_iter != new_mtab.end(); ++new_iter) {
     const FilePath& mount_point = new_iter->first;
     const FilePath& mount_device = new_iter->second;
     MountMap::iterator old_iter = mount_info_map_.find(mount_point);
@@ skipping 50 matching lines @@
     }
   } else {
     type = MediaStorageUtil::FIXED_MASS_STORAGE;
   }
   std::string device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
 
   MountPointInfo mount_point_info;
   mount_point_info.mount_device = mount_device;
   mount_point_info.device_id = device_id;
   mount_point_info.device_name = name;
-  mount_point_info.has_dcim = has_dcim;
 
   mount_info_map_[mount_point] = mount_point_info;
-  mount_priority_map_[mount_device][mount_point] = has_dcim;
+  mount_priority_map_[mount_device][mount_point] = removable;
 
-  if (mount_point_info.has_dcim) {
+  if (removable) {
     SystemMonitor::Get()->ProcessRemovableStorageAttached(device_id, name,
                                                           mount_point.value());
   }
 }
 
-void RemovableDeviceNotificationsLinux::RemoveMediaMount(
-    const std::string& device_id) {
-  SystemMonitor::Get()->ProcessRemovableStorageDetached(device_id);
-}
-
 }  // namespace chrome