summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/fileapi')
-rw-r--r--webkit/fileapi/file_system_file_util.h16
-rw-r--r--webkit/fileapi/local_file_system_file_util.h6
-rw-r--r--webkit/fileapi/obfuscated_file_system_file_util.h1
3 files changed, 11 insertions, 12 deletions
diff --git a/webkit/fileapi/file_system_file_util.h b/webkit/fileapi/file_system_file_util.h
index d6b72e6..f489490 100644
--- a/webkit/fileapi/file_system_file_util.h
+++ b/webkit/fileapi/file_system_file_util.h
@@ -230,6 +230,14 @@ class FileSystemFileUtil {
virtual bool IsDirectory() { return false; }
};
+ // Returns a pointer to a new instance of AbstractFileEnumerator which is
+ // implemented for each FileUtil subclass. The instance needs to be freed
+ // by the caller, and its lifetime should not extend past when the current
+ // call returns to the main FILE message loop.
+ virtual AbstractFileEnumerator* CreateFileEnumerator(
+ FileSystemOperationContext* unused,
+ const FilePath& root_path);
+
protected:
FileSystemFileUtil() { }
@@ -272,14 +280,6 @@ class FileSystemFileUtil {
const FilePath& dest_file_path,
bool copy);
- // Returns a pointer to a new instance of AbstractFileEnumerator which is
- // implemented for each FileUtil subclass. The instance needs to be freed
- // by the caller, and its lifetime should not extend past when the current
- // call returns to the main FILE message loop.
- virtual AbstractFileEnumerator* CreateFileEnumerator(
- FileSystemOperationContext* unused,
- const FilePath& root_path);
-
friend struct DefaultSingletonTraits<FileSystemFileUtil>;
DISALLOW_COPY_AND_ASSIGN(FileSystemFileUtil);
};
diff --git a/webkit/fileapi/local_file_system_file_util.h b/webkit/fileapi/local_file_system_file_util.h
index a7af395..8b18f68 100644
--- a/webkit/fileapi/local_file_system_file_util.h
+++ b/webkit/fileapi/local_file_system_file_util.h
@@ -113,13 +113,13 @@ class LocalFileSystemFileUtil : public FileSystemFileUtil {
FileSystemOperationContext* context,
const FilePath& file_path);
- protected:
- LocalFileSystemFileUtil() { }
-
virtual AbstractFileEnumerator* CreateFileEnumerator(
FileSystemOperationContext* context,
const FilePath& root_path);
+ protected:
+ LocalFileSystemFileUtil() { }
+
friend struct DefaultSingletonTraits<LocalFileSystemFileUtil>;
DISALLOW_COPY_AND_ASSIGN(LocalFileSystemFileUtil);
diff --git a/webkit/fileapi/obfuscated_file_system_file_util.h b/webkit/fileapi/obfuscated_file_system_file_util.h
index e69c49a..88caa65 100644
--- a/webkit/fileapi/obfuscated_file_system_file_util.h
+++ b/webkit/fileapi/obfuscated_file_system_file_util.h
@@ -172,7 +172,6 @@ class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
// object.
AbstractOriginEnumerator* CreateOriginEnumerator();
- protected:
virtual AbstractFileEnumerator* CreateFileEnumerator(
FileSystemOperationContext* context,
const FilePath& root_path) OVERRIDE;