diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 17:35:24 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 17:35:24 +0000 |
commit | f4c6499a37788cd2bc2c4781f005ad2c03fd47e7 (patch) | |
tree | b39c30d15d470617ecbb695e7fc3b48791f4becc /base | |
parent | 9a514902f55117eae04a60f917905e33e9914d32 (diff) | |
download | chromium_src-f4c6499a37788cd2bc2c4781f005ad2c03fd47e7.zip chromium_src-f4c6499a37788cd2bc2c4781f005ad2c03fd47e7.tar.gz chromium_src-f4c6499a37788cd2bc2c4781f005ad2c03fd47e7.tar.bz2 |
Revert "Add file_util::ReplaceFile and use it in ImportantFileWriter."
http://crbug.com/11585
TBR=stoyan
Review URL: http://codereview.chromium.org/113534
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/file_util.h | 7 | ||||
-rw-r--r-- | base/file_util_posix.cc | 4 | ||||
-rw-r--r-- | base/file_util_win.cc | 12 |
3 files changed, 0 insertions, 23 deletions
diff --git a/base/file_util.h b/base/file_util.h index c51e1a0..a3c9a6e 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -160,13 +160,6 @@ bool Move(const FilePath& from_path, const FilePath& to_path); // Deprecated temporary compatibility function. bool Move(const std::wstring& from_path, const std::wstring& to_path); -// Renames file |from_path| to |to_path|. Both paths must be on the same -// volume, or the function will fail. Destination file will be created -// if it doesn't exist. Prefer this function over Move when dealing with -// temporary files. On Windows it preserves attributes of the target file. -// Returns true on success. -bool ReplaceFile(const FilePath& from_path, const FilePath& to_path); - // Copies a single file. Use CopyDirectory to copy directories. bool CopyFile(const FilePath& from_path, const FilePath& to_path); // Deprecated temporary compatibility function. diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 5d44ca3..96c1c17 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -168,10 +168,6 @@ bool Move(const FilePath& from_path, const FilePath& to_path) { return true; } -bool ReplaceFile(const FilePath& from_path, const FilePath& to_path) { - return (rename(from_path.value().c_str(), to_path.value().c_str()) == 0); -} - bool CopyDirectory(const FilePath& from_path, const FilePath& to_path, bool recursive) { diff --git a/base/file_util_win.cc b/base/file_util_win.cc index 77247a4..8964fbf 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -116,18 +116,6 @@ bool Move(const FilePath& from_path, const FilePath& to_path) { return false; } -bool ReplaceFile(const FilePath& from_path, const FilePath& to_path) { - // Make sure that the target file exists. - HANDLE target_file = ::CreateFile(to_path.value().c_str(), 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, CREATE_NEW, - FILE_ATTRIBUTE_NORMAL, NULL); - if (target_file != INVALID_HANDLE_VALUE) - ::CloseHandle(target_file); - return ::ReplaceFile(to_path.value().c_str(), from_path.value().c_str(), - NULL, 0, NULL, NULL) ? true : false; -} - bool CopyFile(const FilePath& from_path, const FilePath& to_path) { // NOTE: I suspect we could support longer paths, but that would involve // analyzing all our usage of files. |