summaryrefslogtreecommitdiffstats
path: root/webkit/chromeos
diff options
context:
space:
mode:
authordmikurube@google.com <dmikurube@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-05 11:41:49 +0000
committerdmikurube@google.com <dmikurube@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-05 11:41:49 +0000
commit7878ecec2dc521aeb4d46071663dbf00897a2b77 (patch)
tree20ebcf685c504be36d13d9f8d78cace7bbe6b4d9 /webkit/chromeos
parent3beeb9a66dac138493948f328107686688a76ff9 (diff)
downloadchromium_src-7878ecec2dc521aeb4d46071663dbf00897a2b77.zip
chromium_src-7878ecec2dc521aeb4d46071663dbf00897a2b77.tar.gz
chromium_src-7878ecec2dc521aeb4d46071663dbf00897a2b77.tar.bz2
[Refactor] to rename and re-layer the file_util stack layers.
Splits FileSystemFileUtil into two classes. 1. FileSystemFileUtil (pure virtual and non-virtual functions + functions to forward to an underlying file_util.) 2. NativeFileUtil (FileUtil for OS-native operations) Renames *FileSystemFileUtil into *FileUtil except for FileSystemFileUtil. Renames *_file_system_file_util.{cc,h} into *_file_util.{cc,h}. Renames variable *_file_system_file_util into *_file_util. BUG=none TEST=All FileAPI-related tests Review URL: http://codereview.chromium.org/7470037 Patch from Dai Mikurube <dmikurube@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/chromeos')
-rw-r--r--webkit/chromeos/fileapi/cros_mount_point_provider.cc8
-rw-r--r--webkit/chromeos/fileapi/cros_mount_point_provider.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
index 2aee434..55b574a 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
@@ -17,9 +17,9 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "webkit/chromeos/fileapi/file_access_permissions.h"
-#include "webkit/fileapi/file_system_file_util.h"
#include "webkit/fileapi/file_system_path_manager.h"
#include "webkit/fileapi/file_system_util.h"
+#include "webkit/fileapi/native_file_util.h"
#include "webkit/glue/webkit_glue.h"
namespace chromeos {
@@ -42,8 +42,8 @@ CrosMountPointProvider::CrosMountPointProvider(
scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy)
: special_storage_policy_(special_storage_policy),
file_access_permissions_(new FileAccessPermissions()),
- local_file_util_(new fileapi::LocalFileSystemFileUtil(
- new fileapi::FileSystemFileUtil())) {
+ local_file_util_(
+ new fileapi::LocalFileUtil(new fileapi::NativeFileUtil())) {
for (size_t i = 0; i < arraysize(fixed_exposed_paths); i++) {
mount_point_map_.insert(std::pair<std::string, FilePath>(
std::string(fixed_exposed_paths[i].web_root_path),
@@ -178,7 +178,7 @@ std::vector<FilePath> CrosMountPointProvider::GetRootDirectories() const {
return root_dirs;
}
-fileapi::FileSystemFileUtil* CrosMountPointProvider::GetFileSystemFileUtil() {
+fileapi::FileSystemFileUtil* CrosMountPointProvider::GetFileUtil() {
return local_file_util_.get();
}
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h
index af7a657..2144b2f 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.h
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h
@@ -1,4 +1,4 @@
- // Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -12,7 +12,7 @@
#include "base/file_path.h"
#include "base/synchronization/lock.h"
#include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
+#include "webkit/fileapi/local_file_util.h"
#include "webkit/quota/special_storage_policy.h"
namespace fileapi {
@@ -47,7 +47,7 @@ class CrosMountPointProvider
bool create);
virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
- virtual fileapi::FileSystemFileUtil* GetFileSystemFileUtil() OVERRIDE;
+ virtual fileapi::FileSystemFileUtil* GetFileUtil() OVERRIDE;
// fileapi::ExternalFileSystemMountPointProvider overrides.
virtual void GrantFullAccessToExtension(
@@ -73,7 +73,7 @@ class CrosMountPointProvider
MountPointMap mount_point_map_;
scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
scoped_ptr<FileAccessPermissions> file_access_permissions_;
- scoped_ptr<fileapi::LocalFileSystemFileUtil> local_file_util_;
+ scoped_ptr<fileapi::LocalFileUtil> local_file_util_;
DISALLOW_COPY_AND_ASSIGN(CrosMountPointProvider);
};