Isolated FS for media devices.

chrome/browser/intents/device_attached_intent_source.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.
 
 #include "chrome/browser/intents/device_attached_intent_source.h"
 
 #include "base/file_path.h"
+#include "base/system_monitor/system_monitor.h"

[Lei Zhang, 2012/08/01 23:49:05]

nit: It's very unlikely you'll ever remove this include from
device_attached_intent_source.h, so you probably don't need it here.

[kmadhusu, 2012/08/02 16:59:03]

Done.

 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/glue/web_intent_data.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
 
 using base::SystemMonitor;
 using content::WebContentsDelegate;
 
 DeviceAttachedIntentSource::DeviceAttachedIntentSource(
     Browser* browser, WebContentsDelegate* delegate)
     : browser_(browser), delegate_(delegate) {
   SystemMonitor* sys_monitor = SystemMonitor::Get();
   if (sys_monitor)
     sys_monitor->AddDevicesChangedObserver(this);
 }
 
 DeviceAttachedIntentSource::~DeviceAttachedIntentSource() {
   SystemMonitor* sys_monitor = SystemMonitor::Get();
   if (sys_monitor)
     sys_monitor->RemoveDevicesChangedObserver(this);
 }
 
 void DeviceAttachedIntentSource::OnMediaDeviceAttached(
     const std::string& id,
     const string16& name,
     base::SystemMonitor::MediaDeviceType type,
     const FilePath::StringType& location) {
   if (!browser_->window()->IsActive())
     return;
 
   // Only handle FilePaths for now.
+  // TODO(kmadhusu): Handle all device types.
   if (type != SystemMonitor::TYPE_PATH)
     return;
 
   // Sanity checks for |device_path|.
   const FilePath device_path(location);
   if (!device_path.IsAbsolute() || device_path.ReferencesParent())
     return;
 
+  // Store the media device info locally.
+  SystemMonitor::MediaDeviceInfo device_info(id, name, type, location);
+  device_id_map_.insert(std::make_pair(id, device_info));
+
   std::string device_name;
 
   // Register device path as an isolated file system.
   // TODO(kinuko, kmadhusu): Use a different file system type for MTP.
   const std::string filesystem_id =
       fileapi::IsolatedContext::GetInstance()->RegisterFileSystemForPath(
           fileapi::kFileSystemTypeIsolated, device_path, &device_name);
 
   CHECK(!filesystem_id.empty());
   webkit_glue::WebIntentData intent(
       ASCIIToUTF16("chrome-extension://attach"),
       ASCIIToUTF16("chrome-extension://filesystem"),
       device_name,
       filesystem_id);
 
   delegate_->WebIntentDispatch(NULL  /* no WebContents */,
                                content::WebIntentsDispatcher::Create(intent));
 }
+
+void DeviceAttachedIntentSource::OnMediaDeviceDetached(const std::string& id) {
+  DeviceIdToInfoMap::iterator it = device_id_map_.find(id);
+  if (it == device_id_map_.end())
+    return;
+
+  FilePath path(it->second.location);
+  // TODO(kinuko, kmadhusu): Revoke file system by path.
+  // fileapi::IsolatedContext::GetInstance()->RevokeFileSystemByPath(path);
+  switch (it->second.type) {
+    case SystemMonitor::TYPE_MTP:

[Lei Zhang, 2012/08/01 23:49:05]

This is currently dead code, since you've returned early on line 53 above in the
attach method.

[kmadhusu, 2012/08/02 16:59:03]

I understand that this is a dead code now, but I am sure we will handle mtp
devices very soon. That is the reason I added a TODO @ line 51. These changes
will make this CL complete. 

+#if defined(SUPPORT_MEDIA_FILESYSTEM)
+      MediaDeviceMapService::GetInstance()->RemoveMediaDevice(

[Lei Zhang, 2012/08/01 23:49:05]

Also, why do this here? Don't you already call RemoveMediaDevice() in
MediaFileSystemRegistry::RevokeMediaFileSystem()?

[kmadhusu, 2012/08/02 16:59:03]

MediaFileSystemRegistry::RevokeMediaFileSystem handles only the devices
registered using MediaFileSystemRegistry::GetMediaFileSystems function.

For eg: When an extension request for media file systems, we  create entries for
the existing devices and media paths. Until, we submit another request, this map
is not updated with the new device details. In the mean time, when a new device
is attached, we register its file path here. So when the device is removed, the
device_id_map_ in MediaFileSystemRegistry does not have an entry for the new
device and hence we don't remove the mtp device interface entry associated with
that device. 

+          it->second.location);
+#endif
+      break;
+    default:

[Lei Zhang, 2012/08/01 23:49:05]

You should use TYPE_PATH here, so if anyone ever add a new device type, they
would have to actively consider what to do here.

[kmadhusu, 2012/08/02 16:59:03]

Done.

+      break;
+  }
+  device_id_map_.erase(it);
+}