Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change.

BUG=chromium-os:14880
TEST=Click "play" button on an audion file in the file browser. Check that the mediaplayer panel has popped up. Click on another file. Check that the mediaplayer playlist panel has popped up and contains 2 items.

Review URL: http://codereview.chromium.org/7067020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87002 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 1 deletions

diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
index b5d40ae..74df6d8 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
@@ -173,5 +173,19 @@ std::vector<FilePath> CrosMountPointProvider::GetRootDirectories() const {
   return root_dirs;
 }
 
+bool CrosMountPointProvider::GetVirtualPath(const FilePath& filesystem_path,
+                                           FilePath* virtual_path) {
+  for (MountPointMap::const_iterator iter = mount_point_map_.begin();
+       iter != mount_point_map_.end();
+       ++iter) {
+    FilePath mount_prefix = iter->second.Append(iter->first);
+    *virtual_path = FilePath(iter->first);
+    if (mount_prefix.AppendRelativePath(filesystem_path, virtual_path)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace chromeos
 
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h
index 7c48df4..40afae2 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.h
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h
@@ -52,6 +52,8 @@ class CrosMountPointProvider
       const std::string& extension_id) OVERRIDE;
   virtual void AddMountPoint(FilePath mount_point) OVERRIDE;
   virtual void RemoveMountPoint(FilePath mount_point) OVERRIDE;
+  virtual bool GetVirtualPath(const FilePath& filesystem_path,
+                              FilePath* virtual_path) OVERRIDE;
 
  private:
   class GetFileSystemRootPathTask;
diff --git a/webkit/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h
index 50e0d39..edf158f 100644
--- a/webkit/fileapi/file_system_mount_point_provider.h
+++ b/webkit/fileapi/file_system_mount_point_provider.h
@@ -70,7 +70,11 @@ class ExternalFileSystemMountPointProvider
   // Adds a new mount point.
   virtual void AddMountPoint(FilePath mount_point) = 0;
   // Remove a mount point.
-  virtual void RemoveMountPoint(FilePath mount_point)  = 0;
+  virtual void RemoveMountPoint(FilePath mount_point) = 0;
+  // Gets virtual path by known filesystem path. Returns false when filesystem
+  // path is not exposed by this provider.
+  virtual bool GetVirtualPath(const FilePath& filesystem_path,
+                              FilePath* virtual_path) = 0;
 };
 
 }  // namespace fileapi