[Media Gallery][Linux] Improve device media gallery names.

chrome/browser/system_monitor/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_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
@@ skipping 10 matching lines @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/public/browser/browser_thread.h"
 
 class FilePath;
 
 // Gets device information given a |device_path|. On success, fills in
-// |unique_id|, |name|, and |removable|.
+// |unique_id|, |name|, |removable| and |partition_size_in_bytes|.
 typedef void (*GetDeviceInfoFunc)(const FilePath& device_path,
-                                  std::string* unique_id, string16* name,
-                                  bool* removable);
+                                  std::string* unique_id,
+                                  string16* name,
+                                  bool* removable,
+                                  uint64* partition_size_in_bytes);
 
 namespace chrome {
 
 class RemovableDeviceNotificationsLinux;
 typedef RemovableDeviceNotificationsLinux RemovableDeviceNotifications;
 
 class RemovableDeviceNotificationsLinux
     : public base::RefCountedThreadSafe<RemovableDeviceNotificationsLinux,
           content::BrowserThread::DeleteOnFileThread> {
  public:
   // Should only be called by browser start up code.  Use GetInstance() instead.
   explicit RemovableDeviceNotificationsLinux(const FilePath& path);
 
   static RemovableDeviceNotificationsLinux* GetInstance();
 
   // Must be called for RemovableDeviceNotificationsLinux to work.
   void Init();
 
   // 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;
 
+  // Returns the storage partition size of the device present at |location|.
+  // If the requested information is unavailable, returns 0.
+  uint64 GetStorageSize(const std::string& location);

[Lei Zhang, 2012/11/13 20:35:04]

nit: const

[kmadhusu, 2012/11/13 21:57:27]

Done.

[Lei Zhang, 2012/11/13 22:17:49]

No, I mean mark the method as const.

[kmadhusu, 2012/11/13 23:05:32]

Done.

+
  protected:
   // Only for use in unit tests.
   RemovableDeviceNotificationsLinux(const FilePath& path,
                                     GetDeviceInfoFunc getDeviceInfo);
 
   // Avoids code deleting the object while there are references to it.
   // Aside from the base::RefCountedThreadSafe friend class, and derived
   // classes, any attempts to call this dtor will result in a compile-time
   // error.
   virtual ~RemovableDeviceNotificationsLinux();
 
   virtual void OnFilePathChanged(const FilePath& path, bool error);
 
  private:
   friend class base::RefCountedThreadSafe<RemovableDeviceNotificationsLinux>;
   friend class base::DeleteHelper<RemovableDeviceNotificationsLinux>;
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::FILE>;
 
-  // Structure to save mounted device information such as device path and unique
-  // identifier.
+  // Structure to save mounted device information such as device path, unique
+  // identifier, device name and partition size.
   struct MountPointInfo {
     FilePath mount_device;
     std::string device_id;
     string16 device_name;
+    uint64 partition_size_in_bytes;
   };
 
   // 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;
 
@@ skipping 38 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_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_