diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 06:56:15 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 06:56:15 +0000 |
| commit | 193854e53c819c67940dc30e6290d7d85bdc463e (patch) | |
| tree | a398519ef84024f6854d4e5724985695cfa47130 /content/browser/fileapi | |
| parent | efcf2059d2fc17cd03bb821bcde2491ce5e330e6 (diff) | |
| download | chromium_src-193854e53c819c67940dc30e6290d7d85bdc463e.zip chromium_src-193854e53c819c67940dc30e6290d7d85bdc463e.tar.gz chromium_src-193854e53c819c67940dc30e6290d7d85bdc463e.tar.bz2 | |
Add Picasa import hooks into MediaFileSystemRegistry.
BUG=151701
Review URL: https://chromiumcodereview.appspot.com/15511009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/fileapi')
| -rw-r--r-- | content/browser/fileapi/fileapi_message_filter.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 61b552b..63641e1 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -749,12 +749,14 @@ void FileAPIMessageFilter::DidCreateSnapshot( // - the file comes from sandboxed filesystem. Reading sandboxed files is // always permitted, but only implicitly. // - the underlying filesystem returned newly created snapshot file. - // - the file comes from an external drive filesystem. The renderer has - // already been granted read permission for the file's nominal path, but - // for drive files, platform paths differ from the nominal paths. + // - the nominal path differs from the platform path. This can happen even + // when the filesystem has been granted permissions. This happens with: + // - Drive filesystems + // - Picasa filesystems DCHECK(snapshot_file || fileapi::SandboxMountPointProvider::IsSandboxType(url.type()) || - url.type() == fileapi::kFileSystemTypeDrive); + url.type() == fileapi::kFileSystemTypeDrive || + url.type() == fileapi::kFileSystemTypePicasa); ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile( process_id_, platform_path); if (snapshot_file) { |