Index: base/files/file_path.h |
diff --git a/base/files/file_path.h b/base/files/file_path.h |
index 0c84af6c8551d16a03f63386777b436eb12ec596..6821e7fcad26313c2e3bb0df919c7d8865f86eea 100644 |
--- a/base/files/file_path.h |
+++ b/base/files/file_path.h |
@@ -119,10 +119,6 @@ |
// enabled and disabled independently, to aid testing. These #defines are |
// here so that the same setting can be used in both the implementation and |
// in the unit test. |
-#if defined(OS_WIN) |
-#define FILE_PATH_USES_DRIVE_LETTERS |
-#define FILE_PATH_USES_WIN_SEPARATORS |
-#endif // OS_WIN |
namespace base { |
@@ -138,11 +134,7 @@ class BASE_EXPORT FilePath { |
// may or may not be specified. On Mac OS X, native pathnames are encoded |
// in UTF-8. |
typedef std::string StringType; |
-#elif defined(OS_WIN) |
- // On Windows, for Unicode-aware applications, native pathnames are wchar_t |
- // arrays encoded in UTF-16. |
- typedef std::wstring StringType; |
-#endif // OS_WIN |
+#endif // OS_POSIX |
typedef StringType::value_type CharType; |
@@ -448,10 +440,7 @@ void PrintTo(const FilePath& path, std::ostream* out); |
#if defined(OS_POSIX) |
#define FILE_PATH_LITERAL(x) x |
#define PRFilePath "s" |
-#elif defined(OS_WIN) |
-#define FILE_PATH_LITERAL(x) L ## x |
-#define PRFilePath "ls" |
-#endif // OS_WIN |
+#endif // OS_POSIX |
// Provide a hash function so that hash_sets and maps can contain FilePath |
// objects. |