Index: chrome/browser/media_gallery/media_file_system_registry.h |
diff --git a/chrome/browser/media_gallery/media_file_system_registry.h b/chrome/browser/media_gallery/media_file_system_registry.h |
index a4055710de1bb16d1555360f1d2503b8d1fa8fe9..a6f5254cddc26c5a7b53a959ad8f94a502959650 100644 |
--- a/chrome/browser/media_gallery/media_file_system_registry.h |
+++ b/chrome/browser/media_gallery/media_file_system_registry.h |
@@ -72,8 +72,9 @@ class MediaFileSystemRegistry |
typedef std::map<const content::RenderProcessHost*, |
MediaPathToFSIDMap> ChildIdToMediaFSMap; |
- // Mapping of device id to mount path. |
- typedef std::map<std::string, FilePath> DeviceIdToMediaPathMap; |
+ // Mapping of device id to media device info. |
+ typedef std::map<std::string, base::SystemMonitor::MediaDeviceInfo> |
+ DeviceIdToInfoMap; |
// Obtain an instance of this class via GetInstance(). |
MediaFileSystemRegistry(); |
@@ -85,7 +86,9 @@ class MediaFileSystemRegistry |
void UnregisterForRPHGoneNotifications(const content::RenderProcessHost* rph); |
// Registers a path as a media file system and return the filesystem id. |
- std::string RegisterPathAsFileSystem(const FilePath& path); |
+ std::string RegisterPathAsFileSystem( |
Lei Zhang
2012/08/01 03:06:30
Can we do (type, path) instead? Same order as stru
kmadhusu
2012/08/01 23:39:35
Done.
|
+ const FilePath& path, |
+ const base::SystemMonitor::MediaDeviceType& type); |
// Revoke a media file system with a given |path|. |
void RevokeMediaFileSystem(const FilePath& path); |
@@ -94,7 +97,7 @@ class MediaFileSystemRegistry |
ChildIdToMediaFSMap media_fs_map_; |
// Only accessed on the UI thread. |
- DeviceIdToMediaPathMap device_id_map_; |
+ DeviceIdToInfoMap device_id_map_; |
// Is only used on the UI thread. |
content::NotificationRegistrar registrar_; |