summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 00:39:43 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 00:39:43 +0000
commit192789437db30ae98d0b05b1d5a43611a5764a99 (patch)
tree17440c0d75923317c342590939a18d70de9642c4
parentabd6615c9f83686d57a138a361852baff2c0d247 (diff)
downloadchromium_src-192789437db30ae98d0b05b1d5a43611a5764a99.zip
chromium_src-192789437db30ae98d0b05b1d5a43611a5764a99.tar.gz
chromium_src-192789437db30ae98d0b05b1d5a43611a5764a99.tar.bz2
FilePath: remove .ToWStringHack()
I introduced this in 2008, thinking it'd be a temporary thing. It has taken a very long time to undo the damage, but it's done now. BUG=69467 Review URL: http://codereview.chromium.org/6659018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77565 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/file_path.cc6
-rw-r--r--base/file_path.h5
2 files changed, 2 insertions, 9 deletions
diff --git a/base/file_path.cc b/base/file_path.cc
index 29ec7a80..a84d017 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -532,9 +532,6 @@ std::string FilePath::MaybeAsASCII() const {
FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
return FilePath(base::SysWideToNativeMB(wstring));
}
-std::wstring FilePath::ToWStringHack() const {
- return base::SysNativeMBToWide(path_);
-}
#elif defined(OS_WIN)
string16 FilePath::LossyDisplayName() const {
return path_;
@@ -550,9 +547,6 @@ std::string FilePath::MaybeAsASCII() const {
FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
return FilePath(wstring);
}
-std::wstring FilePath::ToWStringHack() const {
- return path_;
-}
#endif
// static.
diff --git a/base/file_path.h b/base/file_path.h
index 1afa7a6..42c1877 100644
--- a/base/file_path.h
+++ b/base/file_path.h
@@ -289,9 +289,9 @@ class FilePath {
std::string MaybeAsASCII() const;
// Older Chromium code assumes that paths are always wstrings.
- // These functions convert wstrings to/from FilePaths, and are
+ // This function converts wstrings to FilePaths, and is
// useful to smooth porting that old code to the FilePath API.
- // They have "Hack" in their names so people feel bad about using them.
+ // It has "Hack" its name so people feel bad about using it.
// http://code.google.com/p/chromium/issues/detail?id=24672
//
// If you are trying to be a good citizen and remove these, ask yourself:
@@ -305,7 +305,6 @@ class FilePath {
// LossyDisplayName() function, but keep in mind that you can't
// ever use the result of that again as a path.
static FilePath FromWStringHack(const std::wstring& wstring);
- std::wstring ToWStringHack() const;
// Static helper method to write a StringType to a pickle.
static void WriteStringTypeToPickle(Pickle* pickle,