summaryrefslogtreecommitdiff
path: root/chromium/webkit/browser/fileapi/isolated_context.h
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/webkit/browser/fileapi/isolated_context.h
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/webkit/browser/fileapi/isolated_context.h')
-rw-r--r--chromium/webkit/browser/fileapi/isolated_context.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/webkit/browser/fileapi/isolated_context.h b/chromium/webkit/browser/fileapi/isolated_context.h
index 6b3f85ad98e..2a4ae47dd0d 100644
--- a/chromium/webkit/browser/fileapi/isolated_context.h
+++ b/chromium/webkit/browser/fileapi/isolated_context.h
@@ -144,10 +144,12 @@ class WEBKIT_STORAGE_BROWSER_EXPORT IsolatedContext : public MountPoints {
virtual bool RevokeFileSystem(const std::string& filesystem_id) OVERRIDE;
virtual bool GetRegisteredPath(const std::string& filesystem_id,
base::FilePath* path) const OVERRIDE;
- virtual bool CrackVirtualPath(const base::FilePath& virtual_path,
- std::string* filesystem_id,
- FileSystemType* type,
- base::FilePath* path) const OVERRIDE;
+ virtual bool CrackVirtualPath(
+ const base::FilePath& virtual_path,
+ std::string* filesystem_id,
+ FileSystemType* type,
+ base::FilePath* path,
+ FileSystemMountOption* mount_option) const OVERRIDE;
virtual FileSystemURL CrackURL(const GURL& url) const OVERRIDE;
virtual FileSystemURL CreateCrackedFileSystemURL(
const GURL& origin,