summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-15 13:09:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-15 13:09:27 +0000
commit58b7c5a6c3ecac1a9c6c5e7da032bd06c0863c91 (patch)
tree161a46e0522b42a333ee6e711fc84b25b6a316ca /webkit
parent6b4fa88ebfd4779e1509317b7b09c56e8458f5d9 (diff)
downloadchromium_src-58b7c5a6c3ecac1a9c6c5e7da032bd06c0863c91.zip
chromium_src-58b7c5a6c3ecac1a9c6c5e7da032bd06c0863c91.tar.gz
chromium_src-58b7c5a6c3ecac1a9c6c5e7da032bd06c0863c91.tar.bz2
base: Rename FileEnumerator::FILE_TYPE to FileEnumerator::FileType.
enum types should be named using CamelCase as class and function names, not using MACRO_STYLE. BUG=None TEST=None R=evan@chromium.org Review URL: http://codereview.chromium.org/7618037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/fileapi/file_system_file_util.cc6
-rw-r--r--webkit/fileapi/local_file_system_file_util.cc4
-rw-r--r--webkit/fileapi/obfuscated_file_system_file_util.cc4
3 files changed, 7 insertions, 7 deletions
diff --git a/webkit/fileapi/file_system_file_util.cc b/webkit/fileapi/file_system_file_util.cc
index afb6453..3600a8f 100644
--- a/webkit/fileapi/file_system_file_util.cc
+++ b/webkit/fileapi/file_system_file_util.cc
@@ -110,7 +110,7 @@ PlatformFileError FileSystemFileUtil::ReadDirectory(
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
file_util::FileEnumerator file_enum(
- file_path, false, static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ file_path, false, static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES));
FilePath current;
@@ -521,7 +521,7 @@ class FileSystemFileEnumerator
public:
FileSystemFileEnumerator(const FilePath& root_path,
bool recursive,
- file_util::FileEnumerator::FILE_TYPE file_type)
+ file_util::FileEnumerator::FileType file_type)
: file_enum_(root_path, recursive, file_type) {
}
@@ -549,7 +549,7 @@ FileSystemFileUtil::CreateFileEnumerator(
FileSystemOperationContext* unused,
const FilePath& root_path) {
return new FileSystemFileEnumerator(
- root_path, true, static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ root_path, true, static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES));
}
diff --git a/webkit/fileapi/local_file_system_file_util.cc b/webkit/fileapi/local_file_system_file_util.cc
index 5d14644..ca028e4 100644
--- a/webkit/fileapi/local_file_system_file_util.cc
+++ b/webkit/fileapi/local_file_system_file_util.cc
@@ -233,7 +233,7 @@ class LocalFileSystemFileEnumerator
LocalFileSystemFileEnumerator(const FilePath& platform_root_path,
const FilePath& virtual_root_path,
bool recursive,
- file_util::FileEnumerator::FILE_TYPE file_type)
+ file_util::FileEnumerator::FileType file_type)
: file_enum_(platform_root_path, recursive, file_type),
platform_root_path_(platform_root_path),
virtual_root_path_(virtual_root_path) {
@@ -277,7 +277,7 @@ LocalFileSystemFileUtil::CreateFileEnumerator(
return new EmptyFileEnumerator();
return new LocalFileSystemFileEnumerator(
local_path, root_path, true,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES));
}
diff --git a/webkit/fileapi/obfuscated_file_system_file_util.cc b/webkit/fileapi/obfuscated_file_system_file_util.cc
index abff6cb..52113d6 100644
--- a/webkit/fileapi/obfuscated_file_system_file_util.cc
+++ b/webkit/fileapi/obfuscated_file_system_file_util.cc
@@ -11,10 +11,10 @@
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/message_loop.h"
+#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/sys_string_conversions.h"
-#include "base/stl_util.h"
#include "googleurl/src/gurl.h"
#include "webkit/fileapi/file_system_context.h"
#include "webkit/fileapi/file_system_operation_context.h"
@@ -902,7 +902,7 @@ bool ObfuscatedFileSystemFileUtil::MigrateFromOldSandbox(
return false;
file_util::FileEnumerator file_enum(src_root, true,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES));
FilePath src_full_path;