summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 08:58:48 +0000
committerojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 08:58:48 +0000
commit5775257334a0fc605d27312556ad3123d5909865 (patch)
tree042d664d85ff50ca5d5bf104efad38115e3e4ec3 /base
parent3b00779a8511730abc3935e0f971b7cbdcbc0408 (diff)
downloadchromium_src-5775257334a0fc605d27312556ad3123d5909865.zip
chromium_src-5775257334a0fc605d27312556ad3123d5909865.tar.gz
chromium_src-5775257334a0fc605d27312556ad3123d5909865.tar.bz2
Removes the following deprecated functions:
file_util::InsertBeforeExtension(wstring*, wstring&) file_util::PathComponents(wstring&, vector<wstring>*) file_util::ReplaceExtension(wstring*, wstring&) BUG=none TEST=manual test for importing IE bookmarks with some sub-directories. Original patch by tkent@google.com. See http://codereview.chromium.org/118109 r=ojan,estade git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/file_util.h11
-rw-r--r--base/file_util_win.cc17
2 files changed, 0 insertions, 28 deletions
diff --git a/base/file_util.h b/base/file_util.h
index 7598621..d622fb2 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -40,11 +40,6 @@ namespace file_util {
// Returns a vector of all of the components of the provided path.
void PathComponents(const FilePath& path,
std::vector<FilePath::StringType>* components);
-#if defined(OS_WIN)
-// Deprecated temporary compatibility function.
-void PathComponents(const std::wstring& path,
- std::vector<std::wstring>* components);
-#endif
// Returns true if the given path ends with a path separator character.
bool EndsWithSeparator(const FilePath& path);
@@ -112,12 +107,6 @@ void InsertBeforeExtension(FilePath* path, const FilePath::StringType& suffix);
void ReplaceExtension(FilePath* file_name,
const FilePath::StringType& extension);
-#if defined(OS_WIN)
-// Deprecated temporary compatibility functions.
-void InsertBeforeExtension(std::wstring* path, const std::wstring& suffix);
-void ReplaceExtension(std::wstring* file_name, const std::wstring& extension);
-#endif
-
// Replaces characters in 'file_name' that are illegal for file names with
// 'replace_char'. 'file_name' must not be a full or relative path, but just the
// file name component. Any leading or trailing whitespace in 'file_name' is
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 77247a4..f59f87d 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -809,21 +809,4 @@ void MemoryMappedFile::CloseHandles() {
length_ = INVALID_FILE_SIZE;
}
-// Deprecated functions ----------------------------------------------------
-
-void InsertBeforeExtension(std::wstring* path_str,
- const std::wstring& suffix) {
- FilePath path(*path_str);
- InsertBeforeExtension(&path, suffix);
- path_str->assign(path.value());
-}
-void PathComponents(const std::wstring& path,
- std::vector<std::wstring>* components) {
- PathComponents(FilePath(path), components);
-}
-void ReplaceExtension(std::wstring* file_name, const std::wstring& extension) {
- FilePath path(*file_name);
- ReplaceExtension(&path, extension);
- file_name->assign(path.value());
-}
} // namespace file_util