Isolated FS for media devices.

chrome/browser/media_gallery/media_file_system_registry.cc

 // 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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 
 #include <set>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/isolated_context.h"
+#include "webkit/fileapi/media/media_file_system_config.h"
+
+#if defined(SUPPORT_MEDIA_FILESYSTEM)
+#include "webkit/fileapi/media/media_device_map_service.h"
+
+using fileapi::MediaDeviceMapService;
+#endif
 
 namespace chrome {
 
 static base::LazyInstance<MediaFileSystemRegistry>::Leaky
     g_media_file_system_registry = LAZY_INSTANCE_INITIALIZER;
 
 using base::SystemMonitor;
 using content::BrowserThread;
 using content::RenderProcessHost;
 using fileapi::IsolatedContext;
@@ skipping 35 matching lines @@
   ChildIdToMediaFSMap::iterator& child_it = ret.first;
   if (ret.second) {
     // Never seen a GetMediaFileSystems call from this RPH. Initialize its
     // file system mappings.
     RegisterForRPHGoneNotifications(rph);
     FilePath pictures_path;
     // TODO(vandebo) file system galleries need a unique id as well.
     if (PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path) &&
         IsGalleryPermittedForExtension(extension, SystemMonitor::TYPE_PATH,
                                        pictures_path.value())) {
-      std::string fsid = RegisterPathAsFileSystem(pictures_path);
+      std::string fsid = RegisterPathAsFileSystem(pictures_path,
+                                                  SystemMonitor::TYPE_PATH);
       child_it->second.insert(std::make_pair(pictures_path, fsid));
     }
   }
 
   // TODO(thestig) Handle overlap between devices and media directories.
   SystemMonitor* monitor = SystemMonitor::Get();
   const std::vector<SystemMonitor::MediaDeviceInfo> media_devices =
       monitor->GetAttachedMediaDevices();
   for (size_t i = 0; i < media_devices.size(); ++i) {
     if (media_devices[i].type == SystemMonitor::TYPE_PATH &&
         IsGalleryPermittedForExtension(extension, media_devices[i].type,
                                        media_devices[i].location)) {
       FilePath path(media_devices[i].location);
       device_id_map_.insert(std::make_pair(media_devices[i].unique_id, path));
-      const std::string fsid = RegisterPathAsFileSystem(path);
+      const std::string fsid = RegisterPathAsFileSystem(path,
+                                                        media_devices[i].type);
       child_it->second.insert(std::make_pair(path, fsid));
     }
   }
 
   MediaPathToFSIDMap& child_map = child_it->second;
   for (MediaPathToFSIDMap::const_iterator it = child_map.begin();
        it != child_map.end();
        ++it) {
     const FilePath path = it->first;
     const std::string fsid = it->second;
     results.push_back(std::make_pair(fsid, path));
   }
   return results;
 }
 
-void MediaFileSystemRegistry::OnMediaDeviceDetached(const std::string& id) {
+void MediaFileSystemRegistry::OnMediaDeviceDetached(
+    const std::string& id,
+    const FilePath::StringType& location) {

[Lei Zhang, 2012/07/31 20:48:18]

I don't think you need to change SystemMonitor to have the location parameter in
all its detach methods.

The location parameter is already stored in |device_id_map_|.

[kmadhusu, 2012/08/01 01:43:59]

Fixed.  I realized that I also need type information. Therefore, I modified
device_id_map_ to store MediaDeviceInfo.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DeviceIdToMediaPathMap::iterator it = device_id_map_.find(id);
   if (it == device_id_map_.end())
     return;
+
+#if defined(SUPPORT_MEDIA_FILESYSTEM)
+  MediaDeviceMapService::GetInstance()->RemoveMediaDevice(location);
+#endif
+
   RevokeMediaFileSystem(it->second);
   device_id_map_.erase(it);
 }
 
 void MediaFileSystemRegistry::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_CLOSED ||
          type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
@@ skipping 29 matching lines @@
 
 void MediaFileSystemRegistry::UnregisterForRPHGoneNotifications(
     const content::RenderProcessHost* rph) {
   registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                     content::Source<RenderProcessHost>(rph));
   registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                     content::Source<RenderProcessHost>(rph));
 }
 
 std::string MediaFileSystemRegistry::RegisterPathAsFileSystem(
-    const FilePath& path) {
+    const FilePath& path, const SystemMonitor::MediaDeviceType& device_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Sanity checks for |path|.
   CHECK(path.IsAbsolute());
   CHECK(!path.ReferencesParent());
 
+  fileapi::FileSystemType type = fileapi::kFileSystemTypeIsolated;

[Lei Zhang, 2012/07/31 20:48:18]

This block probably should be a switch statement.

[kinuko, 2012/07/31 23:29:54]

I'm afraid if we change this to a switch statement we may need to update this
file every time we add other completely unrelated file system types (just to
avoid getting warnings), which may not be really desired.

[Lei Zhang, 2012/07/31 23:34:41]

I meant a switch for SystemMonitor::MediaDeviceType, not
fileapi::FileSystemType. We very likely would need to change this code when we
add a new media device type.

[kmadhusu, 2012/08/01 01:43:59]

Done.

+  if (device_type == SystemMonitor::TYPE_MTP)
+    type = fileapi::kFileSystemTypeDeviceMedia;
+
   // The directory name is not exposed to the js layer and we simply use
   // a fixed name (as we only register a single directory per file system).
   std::string register_name("_");
   const std::string fsid =
       IsolatedContext::GetInstance()->RegisterFileSystemForPath(
-          fileapi::kFileSystemTypeIsolated, path, &register_name);
+          type, path, &register_name);
   CHECK(!fsid.empty());
   return fsid;
 }
 
 void MediaFileSystemRegistry::RevokeMediaFileSystem(const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   IsolatedContext* isolated_context = IsolatedContext::GetInstance();
   for (ChildIdToMediaFSMap::iterator child_it = media_fs_map_.begin();
        child_it != media_fs_map_.end();
        ++child_it) {
     MediaPathToFSIDMap& child_map = child_it->second;
     MediaPathToFSIDMap::iterator media_path_it = child_map.find(path);
     if (media_path_it == child_map.end())
       continue;
     isolated_context->RevokeFileSystem(media_path_it->second);
     child_map.erase(media_path_it);
   }
 }
 
 }  // namespace chrome