diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:05:32 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:05:32 +0000 |
| commit | ffc7b4d4d78923095866c6ee60ce7b7daefe89f8 (patch) | |
| tree | 6fe017ff0b18981c8cf9d2a740b6bc20973a85dc /chrome/renderer | |
| parent | b1c4de4c2e2713ed8431d230d1e638efefaa7693 (diff) | |
| download | chromium_src-ffc7b4d4d78923095866c6ee60ce7b7daefe89f8.zip chromium_src-ffc7b4d4d78923095866c6ee60ce7b7daefe89f8.tar.gz chromium_src-ffc7b4d4d78923095866c6ee60ce7b7daefe89f8.tar.bz2 | |
Implement extension API chrome.fileSystem.getDisplayPath().
This allows platform apps to get the full path of file entries in isolated
file systems for display purposes.
BUG=130452
TEST=Test added
Review URL: https://chromiumcodereview.appspot.com/10477009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/experimental.app_custom_bindings.cc | 5 | ||||
| -rw-r--r-- | chrome/renderer/extensions/media_gallery_custom_bindings.cc | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/renderer/extensions/experimental.app_custom_bindings.cc b/chrome/renderer/extensions/experimental.app_custom_bindings.cc index 683f883..65f7a6d 100644 --- a/chrome/renderer/extensions/experimental.app_custom_bindings.cc +++ b/chrome/renderer/extensions/experimental.app_custom_bindings.cc @@ -30,9 +30,8 @@ static v8::Handle<v8::Value> GetIsolatedFileSystem( GURL context_url = UserScriptSlave::GetDataSourceURLForFrame(webframe); CHECK(context_url.SchemeIs(chrome::kExtensionScheme)); - std::string name(fileapi::GetFileSystemName(context_url.GetOrigin(), - fileapi::kFileSystemTypeIsolated)); - name.append(file_system_id); + std::string name(fileapi::GetIsolatedFileSystemName(context_url.GetOrigin(), + file_system_id)); std::string root(fileapi::GetFileSystemRootURI(context_url.GetOrigin(), fileapi::kFileSystemTypeIsolated).spec()); diff --git a/chrome/renderer/extensions/media_gallery_custom_bindings.cc b/chrome/renderer/extensions/media_gallery_custom_bindings.cc index baedab9..2b8a6d3 100644 --- a/chrome/renderer/extensions/media_gallery_custom_bindings.cc +++ b/chrome/renderer/extensions/media_gallery_custom_bindings.cc @@ -57,10 +57,7 @@ v8::Handle<v8::Value> MediaGalleryCustomBindings::GetMediaFileSystemObject( const GURL origin = GURL(webframe->document().securityOrigin().toString()); const GURL root_url = fileapi::GetFileSystemRootURI(origin, fileapi::kFileSystemTypeIsolated); - const std::string fsname_prefix = - fileapi::GetFileSystemName(origin, fileapi::kFileSystemTypeIsolated); - const std::string fsname = - base::StringPrintf("%s_%s", fsname_prefix.c_str(), fsid.c_str()); + const std::string fsname = fileapi::GetIsolatedFileSystemName(origin, fsid); const std::string url = base::StringPrintf("%s%s/%s/", root_url.spec().c_str(), fsid.c_str(), |