webkit/fileapi/local_file_system_file_util.h - Issue 7174002: Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/fileapi/local_file_system_file_util.h

Issue 7174002: Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixed memery leak at LocalFSFUTest, and rebased. Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webkit/fileapi/file_system_quota_unittest.cc ('K') | « webkit/fileapi/file_system_test_helper.cc ('k') | webkit/fileapi/local_file_system_file_util.cc » ('j') | webkit/fileapi/obfuscated_file_system_file_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/fileapi/local_file_system_file_util.h

diff --git a/webkit/fileapi/local_file_system_file_util.h b/webkit/fileapi/local_file_system_file_util.h

index 8b18f68e4e8bfd0588d74c84cae5264b9d3239a3..686585cc6ac504ba1b1e6ec05d6f2833cd5744af 100644

--- a/webkit/fileapi/local_file_system_file_util.h

+++ b/webkit/fileapi/local_file_system_file_util.h

@@ -36,7 +36,7 @@ class FileSystemOperationContext;

class LocalFileSystemFileUtil : public FileSystemFileUtil {

public:

- static LocalFileSystemFileUtil* GetInstance();

+ explicit LocalFileSystemFileUtil(FileSystemFileUtil* underlying_file_util);

virtual PlatformFileError CreateOrOpen(

FileSystemOperationContext* context,

@@ -118,8 +118,6 @@ class LocalFileSystemFileUtil : public FileSystemFileUtil {

const FilePath& root_path);

protected:

- LocalFileSystemFileUtil() { }

friend struct DefaultSingletonTraits<LocalFileSystemFileUtil>;

ericu 2011/06/17 20:32:07 friend declaration is no longer needed.

Dai Mikurube (NOT FULLTIME) 2011/06/23 08:13:32 Done.

DISALLOW_COPY_AND_ASSIGN(LocalFileSystemFileUtil);

@@ -131,6 +129,10 @@ class LocalFileSystemFileUtil : public FileSystemFileUtil {

const GURL& origin_url,

FileSystemType type,

const FilePath& virtual_path);

+ FileSystemFileUtil* underlying_file_util_;

+ static LocalFileSystemFileUtil* GetInstance();

};

} // namespace fileapi