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

Unified Diff: base/file_path.cc

Issue 8402008: Add FilePath::FromUTF8Unsafe() and FilePath::AsUTF8Unsafe(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add Unsafe to names and add more comments and tests Created 9 years, 2 months 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
Index: base/file_path.cc
diff --git a/base/file_path.cc b/base/file_path.cc
index 35361bef7594c5e2223343d46d4ec745edec3675..1689986d703c5b8b5956c895b4d086860481fa85 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -527,6 +527,10 @@ std::string FilePath::MaybeAsASCII() const {
return "";
}
+std::string FilePath::AsUTF8Unsafe() const {
+ return WideToUTF8(base::SysNativeMBToWide(value()));
Mark Mentovai 2011/11/01 21:30:46 Per the comment I made in the header, avoid SysNat
satorux1 2011/11/01 21:49:55 Done.
+}
+
// The *Hack functions are temporary while we fix the remainder of the code.
// Remember to remove the #includes at the top when you remove these.
@@ -534,6 +538,12 @@ std::string FilePath::MaybeAsASCII() const {
FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
return FilePath(base::SysWideToNativeMB(wstring));
}
+
+// static
+FilePath FilePath::FromUTF8Unsafe(const std::string& utf8) {
+ return FilePath(base::SysWideToNativeMB(UTF8ToWide(utf8)));
+}
+
#elif defined(OS_WIN)
string16 FilePath::LossyDisplayName() const {
return path_;
@@ -545,10 +555,19 @@ std::string FilePath::MaybeAsASCII() const {
return "";
}
+std::string FilePath::AsUTF8Unsafe() const {
+ return WideToUTF8(value());
+}
+
// static
FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
return FilePath(wstring);
}
+
+// static
+FilePath FilePath::FromUTF8Unsafe(const std::string& utf8) {
+ return FilePath(UTF8ToWide(utf8));
+}
#endif
void FilePath::WriteToPickle(Pickle* pickle) {
« base/file_path.h ('K') | « base/file_path.h ('k') | base/file_path_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698