diff options
author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 18:37:08 +0000 |
---|---|---|
committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 18:37:08 +0000 |
commit | c5a272dbd00c74dffe922523811a4ecbcd7f882b (patch) | |
tree | 90528ee8bec3657a531a2f5095aff97f5f0a3f18 /webkit/fileapi | |
parent | 445028be1162ed994286addce0b27d0e6239382d (diff) | |
download | chromium_src-c5a272dbd00c74dffe922523811a4ecbcd7f882b.zip chromium_src-c5a272dbd00c74dffe922523811a4ecbcd7f882b.tar.gz chromium_src-c5a272dbd00c74dffe922523811a4ecbcd7f882b.tar.bz2 |
Add Worker support for FileSystem API.
(corresponds to https://bugs.webkit.org/show_bug.cgi?id=45808)
No support for shared workers yet.
BUG=32277
TEST=none; layout tests will be added later.
Review URL: http://codereview.chromium.org/3394003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
-rw-r--r-- | webkit/fileapi/file_system_callback_dispatcher.h | 3 | ||||
-rw-r--r-- | webkit/fileapi/file_system_operation_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/file_system_types.h | 17 | ||||
-rw-r--r-- | webkit/fileapi/webkit_fileapi.gypi | 1 |
4 files changed, 20 insertions, 3 deletions
diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h index 37f22c23..c85c68a 100644 --- a/webkit/fileapi/file_system_callback_dispatcher.h +++ b/webkit/fileapi/file_system_callback_dispatcher.h @@ -8,7 +8,6 @@ #include <vector> #include "base/file_util_proxy.h" -#include "base/string16.h" namespace fileapi { @@ -37,7 +36,7 @@ class FileSystemCallbackDispatcher { // Callback for opening a file system. Called with a name and root path for // the FileSystem when the request is accepted. Used by WebFileSystem API. - virtual void DidOpenFileSystem(const string16& name, + virtual void DidOpenFileSystem(const std::string& name, const FilePath& root_path) = 0; // Called with an error code when a requested operation has failed. diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc index 1d0855c..93680a0 100644 --- a/webkit/fileapi/file_system_operation_unittest.cc +++ b/webkit/fileapi/file_system_operation_unittest.cc @@ -48,7 +48,7 @@ class MockDispatcher : public fileapi::FileSystemCallbackDispatcher { entries_ = entries; } - virtual void DidOpenFileSystem(const string16&, const FilePath&) { + virtual void DidOpenFileSystem(const std::string&, const FilePath&) { NOTREACHED(); } diff --git a/webkit/fileapi/file_system_types.h b/webkit/fileapi/file_system_types.h new file mode 100644 index 0000000..5229f52 --- /dev/null +++ b/webkit/fileapi/file_system_types.h @@ -0,0 +1,17 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_TYPES_H_ +#define WEBKIT_FILEAPI_FILE_SYSTEM_TYPES_H_ + +namespace fileapi { + +enum FileSystemType { + kFileSystemTypeTemporary, + kFileSystemTypePersistent, +}; + +} + +#endif // WEBKIT_FILEAPI_FILE_SYSTEM_TYPES_H_ diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi index 37c75cb..b94cf9e 100644 --- a/webkit/fileapi/webkit_fileapi.gypi +++ b/webkit/fileapi/webkit_fileapi.gypi @@ -17,6 +17,7 @@ 'file_system_callback_dispatcher.h', 'file_system_operation.cc', 'file_system_operation.h', + 'file_system_types.h', ], 'conditions': [ ['inside_chromium_build==0', { |