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

chrome/browser/media_gallery/removable_device_notifications_linux.h

 // 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 listens for mount point changes, notifies
 // the SystemMonitor about the addition and deletion of media devices, and
 // answers queries about mounted devices.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
 
 #if defined(OS_CHROMEOS)
 #error "Use the ChromeOS-specific implementation instead."
 #endif
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/browser_thread.h"
 
 class FilePath;
 
-// Gets the media device information given a |device_path|. On success,
-// returns true and fills in |unique_id|, |name|, and |removable|.
+// Gets device information given a |device_path|. On success, returns true and
+// fills in |unique_id|, |name|, and |removable|.
 typedef bool (*GetDeviceInfoFunc)(const FilePath& device_path,
                                   std::string* unique_id, string16* name,
                                   bool* removable);
 
 namespace chrome {
 
 class RemovableDeviceNotificationsLinux
     : public base::RefCountedThreadSafe<RemovableDeviceNotificationsLinux,
           content::BrowserThread::DeleteOnFileThread> {
  public:
@@ skipping 34 matching lines @@
       content::BrowserThread::FILE>;
 
   // Structure to save mounted device information such as device path and unique
   // identifier.
   struct MountPointInfo {
     MountPointInfo();
 
     FilePath mount_device;
     std::string device_id;
     string16 device_name;
-    bool has_dcim;
   };
 
   // Mapping of mount points to MountPointInfo.
   typedef std::map<FilePath, MountPointInfo> MountMap;
 
   // (mount point, priority)
   // For devices that are mounted to multiple mount points, this helps us track
   // which one we've notified system monitor about.
   typedef std::map<FilePath, bool> ReferencedMountPoint;
 
   // (mount device, map of known mount points)
   // For each mount device, track the places it is mounted and which one (if
   // any) we have notified system monitor about.
   typedef std::map<FilePath, ReferencedMountPoint> MountPriorityMap;
 
   // Do initialization on the File Thread.
   void InitOnFileThread();
 
   // Parses mtab file and find all changes.
   void UpdateMtab();
 
   // Adds |mount_device| as mounted on |mount_point|.  If the device is a new
-  // media device, SystemMonitor is notified.
+  // device SystemMonitor is notified.
   void AddNewMount(const FilePath& mount_device, const FilePath& mount_point);
 
-  // Removes media device with a given device id.
-  void RemoveMediaMount(const std::string& device_id);
-
   // Whether Init() has been called or not.
   bool initialized_;
 
   // Mtab file that lists the mount points.
   const FilePath mtab_path_;
 
   // Watcher for |mtab_path_|.
   base::files::FilePathWatcher file_watcher_;
 
   // Set of known file systems that we care about.
@@ skipping 13 matching lines @@
   // to notify about it's departure and notify about another one of it's mount
   // points.
   MountPriorityMap mount_priority_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_