Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: webkit/browser/fileapi/local_file_util.cc

Issue 105293002: Move more file_util functions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « webkit/browser/fileapi/dragged_file_util.cc ('k') | webkit/browser/fileapi/native_file_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/browser/fileapi/local_file_util.cc
diff --git a/webkit/browser/fileapi/local_file_util.cc b/webkit/browser/fileapi/local_file_util.cc
index 3357c697d6267899a390ff56920c66e31bef67a8..db2e50c955e9f4ed019a10638427270b88db9c48 100644
--- a/webkit/browser/fileapi/local_file_util.cc
+++ b/webkit/browser/fileapi/local_file_util.cc
@@ -51,7 +51,7 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
base::FilePath LocalFileEnumerator::Next() {
base::FilePath next = file_enum_.Next();
// Don't return symlinks.
- while (!next.empty() && file_util::IsLink(next))
+ while (!next.empty() && base::IsLink(next))
next = file_enum_.Next();
if (next.empty())
return next;
@@ -88,7 +88,7 @@ PlatformFileError LocalFileUtil::CreateOrOpen(
if (error != base::PLATFORM_FILE_OK)
return error;
// Disallow opening files in symlinked paths.
- if (file_util::IsLink(file_path))
+ if (base::IsLink(file_path))
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
return NativeFileUtil::CreateOrOpen(
file_path, file_flags, file_handle, created);
@@ -132,7 +132,7 @@ PlatformFileError LocalFileUtil::GetFileInfo(
if (error != base::PLATFORM_FILE_OK)
return error;
// We should not follow symbolic links in sandboxed file system.
- if (file_util::IsLink(file_path))
+ if (base::IsLink(file_path))
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
error = NativeFileUtil::GetFileInfo(file_path, file_info);
if (error == base::PLATFORM_FILE_OK)
« no previous file with comments | « webkit/browser/fileapi/dragged_file_util.cc ('k') | webkit/browser/fileapi/native_file_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698