summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/file_util.cc2
-rw-r--r--base/file_util.h8
-rw-r--r--base/file_util_posix.cc12
-rw-r--r--base/file_util_proxy.cc2
-rw-r--r--base/file_util_unittest.cc8
-rw-r--r--base/file_util_win.cc8
-rw-r--r--base/test/test_file_util_posix.cc10
-rw-r--r--chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc4
-rw-r--r--chrome/common/extensions/extension_file_util.cc2
-rw-r--r--chrome/common/zip.cc4
-rw-r--r--chrome/common/zip_unittest.cc2
-rw-r--r--chrome/installer/util/duplicate_tree_detector.cc2
-rw-r--r--chrome/tools/profiles/generate_profile.cc2
-rw-r--r--content/browser/renderer_host/pepper_file_message_filter.cc2
-rw-r--r--net/base/directory_lister.cc2
-rw-r--r--net/disk_cache/cache_util_posix.cc4
-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
19 files changed, 44 insertions, 44 deletions
diff --git a/base/file_util.cc b/base/file_util.cc
index 9c3381e..e9f1d4e 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -160,7 +160,7 @@ bool ReadFileToString(const FilePath& path, std::string* contents) {
bool IsDirectoryEmpty(const FilePath& dir_path) {
FileEnumerator files(dir_path, false,
- static_cast<FileEnumerator::FILE_TYPE>(
+ static_cast<FileEnumerator::FileType>(
FileEnumerator::FILES | FileEnumerator::DIRECTORIES));
if (files.Next().value().empty())
return true;
diff --git a/base/file_util.h b/base/file_util.h
index a6bb972..cd7fa9f 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -423,7 +423,7 @@ class BASE_EXPORT FileEnumerator {
} FindInfo;
#endif
- enum FILE_TYPE {
+ enum FileType {
FILES = 1 << 0,
DIRECTORIES = 1 << 1,
INCLUDE_DOT_DOT = 1 << 2,
@@ -454,10 +454,10 @@ class BASE_EXPORT FileEnumerator {
// TODO(erikkay): Fix the pattern matching to work at all levels.
FileEnumerator(const FilePath& root_path,
bool recursive,
- FileEnumerator::FILE_TYPE file_type);
+ FileType file_type);
FileEnumerator(const FilePath& root_path,
bool recursive,
- FileEnumerator::FILE_TYPE file_type,
+ FileType file_type,
const FilePath::StringType& pattern);
~FileEnumerator();
@@ -503,7 +503,7 @@ class BASE_EXPORT FileEnumerator {
FilePath root_path_;
bool recursive_;
- FILE_TYPE file_type_;
+ FileType file_type_;
FilePath::StringType pattern_; // Empty when we want to find everything.
// A stack that keeps track of which subdirectories we still need to
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 5c9fb14..9904584 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -172,7 +172,7 @@ bool Delete(const FilePath& path, bool recursive) {
bool success = true;
std::stack<std::string> directories;
directories.push(path.value());
- FileEnumerator traversal(path, true, static_cast<FileEnumerator::FILE_TYPE>(
+ FileEnumerator traversal(path, true, static_cast<FileEnumerator::FileType>(
FileEnumerator::FILES | FileEnumerator::DIRECTORIES |
FileEnumerator::SHOW_SYM_LINKS));
for (FilePath current = traversal.Next(); success && !current.empty();
@@ -260,11 +260,11 @@ bool CopyDirectory(const FilePath& from_path,
return false;
bool success = true;
- FileEnumerator::FILE_TYPE traverse_type =
- static_cast<FileEnumerator::FILE_TYPE>(FileEnumerator::FILES |
+ FileEnumerator::FileType traverse_type =
+ static_cast<FileEnumerator::FileType>(FileEnumerator::FILES |
FileEnumerator::SHOW_SYM_LINKS);
if (recursive)
- traverse_type = static_cast<FileEnumerator::FILE_TYPE>(
+ traverse_type = static_cast<FileEnumerator::FileType>(
traverse_type | FileEnumerator::DIRECTORIES);
FileEnumerator traversal(from_path, recursive, traverse_type);
@@ -642,7 +642,7 @@ bool SetCurrentDirectory(const FilePath& path) {
FileEnumerator::FileEnumerator(const FilePath& root_path,
bool recursive,
- FileEnumerator::FILE_TYPE file_type)
+ FileType file_type)
: current_directory_entry_(0),
root_path_(root_path),
recursive_(recursive),
@@ -654,7 +654,7 @@ FileEnumerator::FileEnumerator(const FilePath& root_path,
FileEnumerator::FileEnumerator(const FilePath& root_path,
bool recursive,
- FileEnumerator::FILE_TYPE file_type,
+ FileType file_type,
const FilePath::StringType& pattern)
: current_directory_entry_(0),
root_path_(root_path),
diff --git a/base/file_util_proxy.cc b/base/file_util_proxy.cc
index 9b9ed88..be6465d 100644
--- a/base/file_util_proxy.cc
+++ b/base/file_util_proxy.cc
@@ -439,7 +439,7 @@ class RelayReadDirectory : public MessageLoopRelay {
}
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;
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index c60a703..c44b804 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -112,8 +112,8 @@ bool DeleteReparsePoint(HANDLE source) {
const wchar_t bogus_content[] = L"I'm cannon fodder.";
-const file_util::FileEnumerator::FILE_TYPE FILES_AND_DIRECTORIES =
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+const file_util::FileEnumerator::FileType FILES_AND_DIRECTORIES =
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES);
@@ -1611,7 +1611,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) {
// Test an empty directory, non-recursively, including "..".
file_util::FileEnumerator f0_dotdot(temp_dir_.path(), false,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
FILES_AND_DIRECTORIES | file_util::FileEnumerator::INCLUDE_DOT_DOT));
EXPECT_EQ(temp_dir_.path().Append(FILE_PATH_LITERAL("..")).value(),
f0_dotdot.Next().value());
@@ -1669,7 +1669,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) {
// Only enumerate directories, non-recursively, including "..".
file_util::FileEnumerator f2_dotdot(
temp_dir_.path(), false,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::INCLUDE_DOT_DOT));
FindResultCollector c2_dotdot(f2_dotdot);
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 9a138a3..fab91f6 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -17,14 +17,14 @@
#include "base/file_path.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
-#include "base/win/pe_image.h"
-#include "base/win/scoped_handle.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
+#include "base/win/pe_image.h"
#include "base/win/scoped_comptr.h"
+#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
@@ -848,7 +848,7 @@ bool SetCurrentDirectory(const FilePath& directory) {
FileEnumerator::FileEnumerator(const FilePath& root_path,
bool recursive,
- FileEnumerator::FILE_TYPE file_type)
+ FileType file_type)
: recursive_(recursive),
file_type_(file_type),
has_find_data_(false),
@@ -860,7 +860,7 @@ FileEnumerator::FileEnumerator(const FilePath& root_path,
FileEnumerator::FileEnumerator(const FilePath& root_path,
bool recursive,
- FileEnumerator::FILE_TYPE file_type,
+ FileType file_type,
const FilePath::StringType& pattern)
: recursive_(recursive),
file_type_(file_type),
diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc
index 5adbcc2..b9485d0 100644
--- a/base/test/test_file_util_posix.cc
+++ b/base/test/test_file_util_posix.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -6,14 +6,14 @@
#include <errno.h>
#include <fcntl.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <string>
-#include "base/logging.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/logging.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -49,8 +49,8 @@ bool CopyRecursiveDirNoCache(const FilePath& source_dir,
return false;
bool success = true;
- FileEnumerator::FILE_TYPE traverse_type =
- static_cast<FileEnumerator::FILE_TYPE>(FileEnumerator::FILES |
+ FileEnumerator::FileType traverse_type =
+ static_cast<FileEnumerator::FileType>(FileEnumerator::FILES |
FileEnumerator::SHOW_SYM_LINKS | FileEnumerator::DIRECTORIES);
FileEnumerator traversal(source_dir, true, traverse_type);
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
index ff34297..f37d06b 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
@@ -127,8 +127,8 @@ class SandboxedExtensionUnpackerTest : public testing::Test {
bool TempFilesRemoved() {
// Check that temporary files were cleaned up.
- file_util::FileEnumerator::FILE_TYPE files_and_dirs =
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ file_util::FileEnumerator::FileType files_and_dirs =
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::FILES);
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 227b5d5..e7ba195 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -497,7 +497,7 @@ bool CheckForIllegalFilenames(const FilePath& extension_path,
file_util::FileEnumerator all_files(
extension_path,
false,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::FILES));
diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc
index d5ff5d0..0df0b17 100644
--- a/chrome/common/zip.cc
+++ b/chrome/common/zip.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -291,7 +291,7 @@ bool Zip(const FilePath& src_dir, const FilePath& dest_file,
bool success = true;
file_util::FileEnumerator file_enumerator(
src_dir, true, // recursive
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES));
for (FilePath path = file_enumerator.Next(); !path.value().empty();
diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc
index 38d7227..66aec32 100644
--- a/chrome/common/zip_unittest.cc
+++ b/chrome/common/zip_unittest.cc
@@ -53,7 +53,7 @@ class ZipTest : public PlatformTest {
ASSERT_TRUE(Unzip(path, test_dir_));
file_util::FileEnumerator files(test_dir_, true,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES));
FilePath next_path = files.Next();
diff --git a/chrome/installer/util/duplicate_tree_detector.cc b/chrome/installer/util/duplicate_tree_detector.cc
index 0489f9c..cc80f0c 100644
--- a/chrome/installer/util/duplicate_tree_detector.cc
+++ b/chrome/installer/util/duplicate_tree_detector.cc
@@ -31,7 +31,7 @@ bool IsIdenticalFileHierarchy(const FilePath& src_path,
FileEnumerator path_enum(
src_path,
false, // Not recursive
- static_cast<FileEnumerator::FILE_TYPE>(
+ static_cast<FileEnumerator::FileType>(
FileEnumerator::FILES | FileEnumerator::DIRECTORIES));
for (FilePath path = path_enum.Next(); is_identical && !path.empty();
path = path_enum.Next()) {
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc
index cdb21cd..751a8e7 100644
--- a/chrome/tools/profiles/generate_profile.cc
+++ b/chrome/tools/profiles/generate_profile.cc
@@ -266,7 +266,7 @@ int main(int argc, const char* argv[]) {
file_util::FileEnumerator file_iterator(
profile.GetPath(), false,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES));
FilePath path = file_iterator.Next();
while (!path.empty()) {
diff --git a/content/browser/renderer_host/pepper_file_message_filter.cc b/content/browser/renderer_host/pepper_file_message_filter.cc
index b1b9e19..3b37cfc 100644
--- a/content/browser/renderer_host/pepper_file_message_filter.cc
+++ b/content/browser/renderer_host/pepper_file_message_filter.cc
@@ -197,7 +197,7 @@ void PepperFileMessageFilter::OnGetDirContents(
file_util::FileEnumerator enumerator(
full_path, false,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::FILES |
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::INCLUDE_DOT_DOT));
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index dc41756..ee1f138 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -196,7 +196,7 @@ void DirectoryLister::Core::StartInternal() {
types |= file_util::FileEnumerator::INCLUDE_DOT_DOT;
file_util::FileEnumerator file_enum(dir_, recursive_,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(types));
+ static_cast<file_util::FileEnumerator::FileType>(types));
FilePath path;
while (lister_ && !(path = file_enum.Next()).empty()) {
diff --git a/net/disk_cache/cache_util_posix.cc b/net/disk_cache/cache_util_posix.cc
index bc87746..ec5f931 100644
--- a/net/disk_cache/cache_util_posix.cc
+++ b/net/disk_cache/cache_util_posix.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
@@ -25,7 +25,7 @@ bool MoveCache(const FilePath& from_path, const FilePath& to_path) {
file_util::FileEnumerator iter(
from_path,
/* recursive */ false,
- static_cast<file_util::FileEnumerator::FILE_TYPE>(
+ static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::FILES));
for (FilePath name = iter.Next(); !name.value().empty(); name = iter.Next()) {
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;
generated by cgit v1.1 at 2025-02-01 17:21:42 +0000