[Media Galleries] Populate volume metadata in ChromeOS/Linux

chrome/browser/storage_monitor/storage_monitor_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.
 
 // StorageMonitorLinux listens for mount point changes, notifies listeners
 // about the addition and deletion of media devices, and answers queries about
 // mounted devices.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_LINUX_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_LINUX_H_
@@ skipping 11 matching lines @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace base {
 class FilePath;
 }
 
-// Gets device information given a |device_path|. On success, fills in
-// |unique_id|, |name|, |removable| and |partition_size_in_bytes|.
+// Gets device information given a |device_path| and |mount_point|.
+// On success, fills in metadata fields.
 typedef void (*GetDeviceInfoFunc)(const base::FilePath& device_path,
-                                  std::string* unique_id,
+                                  const base::FilePath& mount_point,
+                                  std::string* device_id,
                                   string16* name,
                                   bool* removable,
-                                  uint64* partition_size_in_bytes);
+                                  uint64* partition_size_in_bytes,
+                                  string16* volume_label,
+                                  string16* vendor_name,
+                                  string16* model_name);
 
 namespace chrome {
 
 class StorageMonitorLinux
     : public StorageMonitor,
       public base::RefCountedThreadSafe<StorageMonitorLinux,
           content::BrowserThread::DeleteOnFileThread> {
  public:
   // Should only be called by browser start up code.  Use GetInstance() instead.
   explicit StorageMonitorLinux(const base::FilePath& path);
@@ skipping 26 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<StorageMonitorLinux>;
   friend class base::DeleteHelper<StorageMonitorLinux>;
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::FILE>;
 
   // Structure to save mounted device information such as device path, unique
   // identifier, device name and partition size.
   struct MountPointInfo {
-    MountPointInfo();
-
     base::FilePath mount_device;
-    std::string device_id;
-    string16 device_name;
-    uint64 partition_size_in_bytes;
+    StorageInfo storage_info;
   };
 
   // Mapping of mount points to MountPointInfo.
   typedef std::map<base::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<base::FilePath, bool> ReferencedMountPoint;
 
@@ skipping 39 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(StorageMonitorLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_LINUX_H_