[LINUX] Extract the name and id of the device and send it along the device attach message.

chrome/browser/media_gallery/media_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.
 
 // MediaDeviceNotificationsLinux listens for mount point changes and notifies
 // the SystemMonitor about the addition and deletion of media devices.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_
 
@@ skipping 34 matching lines @@
 
   virtual void OnFilePathChanged(const FilePath& path, bool error);
 
  private:
   friend class base::RefCountedThreadSafe<MediaDeviceNotificationsLinux>;
   friend class base::DeleteHelper<MediaDeviceNotificationsLinux>;
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::FILE>;
 
   // (mount device, device id)
   typedef std::pair<std::string, std::string> MountDeviceAndId;

[vandebo (ex-Chrome), 2012/08/09 17:52:35]

You don't have to fix it, but if you feel like this, we should change this to a
struct instead of a pair. Doing so will make things much easier to read.

[kmadhusu, 2012/08/09 23:41:29]

Done.

   // Mapping of mount points to MountDeviceAndId.
   typedef std::map<std::string, MountDeviceAndId> MountMap;
 
+  // (mount point, mount device)
+  // Helper map to get new entries from mtab file.
+  typedef std::map<std::string, std::string> MountPointDeviceMap;
+
+  // Get mounted device properties. This function is exposed for unit test.
+  virtual bool GetDeviceInfo(const std::string& dev_path,

[kmadhusu, 2012/08/09 23:41:29]

Moved this function to anonymous namespace and included a new constructor for
unit testing.

+                             std::string* device_label,
+                             string16* device_name);
+
   void InitOnFileThread();
 
   // Parse the mtab file and find all changes.
   void UpdateMtab();
 
   // Read the mtab file entries into |mtab|.
-  void ReadMtab(MountMap* mtab);
+  void ReadMtab(MountPointDeviceMap* mtab);
 
   // Add a media device with a given device and mount device. Assign it a device
   // id as well.
   void AddNewDevice(const std::string& mount_device,
                     const std::string& mount_point,
                     std::string* device_id);
 
   // Remove a media device with a given device id.
   void RemoveOldDevice(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_;
 
   // Mapping of relevant mount points and their corresponding mount devices.
   // Keep in mind on Linux, a device can be mounted at multiple mount points,
   // and multiple devices can be mounted at a mount point.
   MountMap mtab_;

[vandebo (ex-Chrome), 2012/08/09 17:52:35]

This is more than the mtab now, right?  mtab_ -> mount_info_map_ ?

[kmadhusu, 2012/08/09 23:41:29]

Done.

 
-  // The lowest available device id number.
-  // TODO(thestig) Remove this and use a real per-device unique id instead.
-  int current_device_id_;
-
   // Set of known file systems that we care about.
   std::set<std::string> known_file_systems_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDeviceNotificationsLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_