[Chrome OS]Implement MediaStorageUtil::GetDeviceInfoForPath function to support media gallery permi…

chrome/browser/system_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros listens for mount point changes
 // and notifies the SystemMonitor about the addition and deletion of media
 // devices.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_
@@ skipping 10 matching lines @@
 #include "base/memory/ref_counted.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
 namespace chromeos {
 
 class RemovableDeviceNotificationsCros
     : public base::RefCountedThreadSafe<RemovableDeviceNotificationsCros>,
       public disks::DiskMountManager::Observer {
  public:
+  // Should only be called by browser start up code. Use GetInstance() instead.
   RemovableDeviceNotificationsCros();
 
+  static RemovableDeviceNotificationsCros* GetInstance();
+
   virtual void DiskChanged(disks::DiskMountManagerEventType event,
                            const disks::DiskMountManager::Disk* disk) OVERRIDE;
   virtual void DeviceChanged(disks::DiskMountManagerEventType event,
                              const std::string& device_path) OVERRIDE;
   virtual void MountCompleted(
       disks::DiskMountManager::MountEvent event_type,
       MountError error_code,
       const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE;
 
+  // Finds the device that contains |path| and populates |device_info|.
+  // Returns false if unable to find the device.
+  bool GetDeviceInfoForPath(
+      const FilePath& path,
+      base::SystemMonitor::RemovableStorageInfo* device_info) const;
+
  private:
   friend class base::RefCountedThreadSafe<RemovableDeviceNotificationsCros>;
 
-  // Mapping of mount points to mount device IDs.
-  typedef std::map<std::string, std::string> MountMap;
+  // Structure to save mounted device information such as device unique id, name
+  // and device path.
+  struct DeviceInfo {

[Lei Zhang, 2012/09/16 00:17:05]

Is this already defined elsewhere?

[kmadhusu, 2012/09/16 22:35:42]

DeviceInfo and StorageInfo structs has the same member fields as
RemovableStorageInfo. So, removed the new structs and created instances of
SystemMonitor::RemovableStorageInfo.

+    DeviceInfo();
+
+    // Store the unique device identifier (e.g: "dcim:UUID:AAFF:FFAA")
+    std::string id;
+    // Store the device name (e.g: "USB Co.")
+    string16 name;
+    // Store the device mount path (e.g: "/media/removable/SD card")
+    std::string location;
+  };
+
+  // Mapping of mount path to device info.
+  typedef std::map<std::string, DeviceInfo> MountMap;
 
   // Private to avoid code deleting the object.
   virtual ~RemovableDeviceNotificationsCros();
 
   // Checks existing mount points map for media devices. For each mount point,
   // call CheckMountedPathOnFileThread() below.
   void CheckExistingMountPointsOnUIThread();
 
   // Checks if the mount point in |mount_info| is a media device. If it is,
   // then continue with AddMountedPathOnUIThread() below.
@@ skipping 10 matching lines @@
   // Mapping of relevant mount points and their corresponding mount devices.
   // Only accessed on the UI thread.
   MountMap mount_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsCros);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_