summaryrefslogtreecommitdiffstats
path: root/webkit/chromeos
diff options
context:
space:
mode:
authorserya@google.com <serya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 10:11:40 +0000
committerserya@google.com <serya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 10:11:40 +0000
commitce9802042c9b9ff0bd4e60b017333ff5735201b2 (patch)
tree6914a3c7fb6fa398fddb0096dc9db62d7d4d632c /webkit/chromeos
parent60a1d495e24ed67cd9c1559395d183cd8a85504f (diff)
downloadchromium_src-ce9802042c9b9ff0bd4e60b017333ff5735201b2.zip
chromium_src-ce9802042c9b9ff0bd4e60b017333ff5735201b2.tar.gz
chromium_src-ce9802042c9b9ff0bd4e60b017333ff5735201b2.tar.bz2
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
Diffstat (limited to 'webkit/chromeos')
-rw-r--r--webkit/chromeos/fileapi/cros_mount_point_provider.cc14
-rw-r--r--webkit/chromeos/fileapi/cros_mount_point_provider.h2
2 files changed, 16 insertions, 0 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;